rsnumpy 0.1.6__tar.gz → 0.1.7__tar.gz

{rsnumpy-0.1.6 → rsnumpy-0.1.7}/.gitignore

@@ -14,6 +14,7 @@ dist/
 build/
 *.egg
 .venv/
+test/
 venv/
 uv.lock
 
@@ -32,6 +33,7 @@ Thumbs.db
 push*.sh
 main*.py
 test*.py
+run*.py
 debug*.py
 check*.py
 

{rsnumpy-0.1.6 → rsnumpy-0.1.7}/Cargo.lock

@@ -669,7 +669,7 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3"
 
 [[package]]
 name = "rsnumpy"
-version = "0.1.6"
+version = "0.1.7"
 dependencies = [
  "ndarray",
  "num-traits",

{rsnumpy-0.1.6 → rsnumpy-0.1.7}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rsnumpy"
-version = "0.1.6"
+version = "0.1.7"
 edition = "2024"
 readme = "README.md"
 

{rsnumpy-0.1.6 → rsnumpy-0.1.7}/PKG-INFO

@@ -1,13 +1,10 @@
 Metadata-Version: 2.4
 Name: rsnumpy
-Version: 0.1.6
+Version: 0.1.7
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
-Requires-Dist: maturin>=1.14.0
-Requires-Dist: rsplotlib>=0.1.4
-Requires-Dist: xlrd>=2.0.2
 License-File: LICENSE
 Summary: A Rust-powered NumPy-compatible array library.
 Author: YJ-Niu

{rsnumpy-0.1.6 → rsnumpy-0.1.7}/build_wheel.sh

@@ -6,10 +6,16 @@ set -euo pipefail
 
 RELEASE=true
 OUT_DIR="wheelhouse"
+cache_file="/Users/user/Desktop/rust_project/rsplotlib/python/rsplotlib/rsplotlib.cpython-313-darwin.so"
 # 如果 wheelhouse 目录存在, 则删除
 if [[ -d "$OUT_DIR" ]]; then
   rm -rf "$OUT_DIR"
 fi
+# 如果 cache_file 目录存在, 则删除
+if [[ -f "$cache_file" ]]; then
+  rm "$cache_file"
+fi
+
 # Default python executable; may be overridden by --python or positional arg
 PYTHON_EXEC="python"
 # Flag set when the user explicitly provided a Python executable
@@ -70,18 +76,6 @@ if [[ -n "$WHEEL" && -f "$WHEEL" ]]; then
   else
     echo "Warning: .venv not found; skip install. Wheels available in $OUT_DIR" >&2
   fi
-  # 同步 .so 到项目内的 rsnumpy 包目录，避免本地源包遮蔽安装的 wheel
-  SO_FILE=".venv/lib/python${PYTHON_VERSION:-3.13}/site-packages/rsnumpy/_core.cpython-${PYTHON_VERSION:-313}-darwin.so"
-  if [[ -f "$SO_FILE" ]]; then
-    cp -f "$SO_FILE" "rsnumpy/_core.cpython-${PYTHON_VERSION:-313}-darwin.so" 2>/dev/null || true
-  fi
-  # 通用回退：找任何 .venv 中刚生成的 _core .so
-  SO_GLOB=$(ls .venv/lib/python*/site-packages/rsnumpy/_core.cpython-*-darwin.so 2>/dev/null | head -1)
-  if [[ -n "$SO_GLOB" && -f "$SO_GLOB" ]]; then
-    DEST="rsnumpy/$(basename "$SO_GLOB")"
-    cp -f "$SO_GLOB" "$DEST"
-    echo "Synced $DEST"
-  fi
 else
   echo "Warning: no .whl file found in $OUT_DIR; skip install." >&2
 fi

{rsnumpy-0.1.6 → rsnumpy-0.1.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "rsnumpy"
-version = "0.1.6"
+version = "0.1.7"
 requires-python = ">=3.8"
 description = "A Rust-powered NumPy-compatible array library."
 readme = "README.md"
@@ -19,12 +19,8 @@ classifiers = [
     "Programming Language :: Python :: Implementation :: PyPy",
 ]
 dynamic = ["version"]
-dependencies = [
-    "maturin>=1.14.0",
-    "rsplotlib>=0.1.4",
-    "xlrd>=2.0.2",
-]
 
 [tool.maturin]
 module-name = "rsnumpy._core"
-include = ["rsnumpy/__init__.py", "rsnumpy/linalg/__init__.py", "rsnumpy/random/__init__.py"]
+python-source = "python"
+include = ["python/rsnumpy/__init__.py", "python/rsnumpy/linalg/__init__.py", "python/rsnumpy/random/__init__.py"]

{rsnumpy-0.1.6 → rsnumpy-0.1.7/python}/rsnumpy/__init__.py

@@ -66,6 +66,9 @@ class ndarray:
     def __repr__(self):
         return repr(self._array)
 
+    def __str__(self):
+        return str(self._array)
+
     def __len__(self):
         if self.ndim == 0:
             raise TypeError("len() of unsized object")

{rsnumpy-0.1.6 → rsnumpy-0.1.7}/src/lib.rs

@@ -107,13 +107,9 @@ fn format_array_repr(arr: &Array<f64, IxDyn>, _prefix: &str) -> String {
         let mut s = String::from("[");
         for (i, val) in arr.iter().enumerate() {
             if i > 0 {
-                s.push_str(", ");
-            }
-            if *val == val.floor() && val.is_finite() {
-                s.push_str(&format!("{}.", val));
-            } else {
-                s.push_str(&format!("{}", val));
+                s.push_str(" ");
             }
+            s.push_str(&format_scalar(*val));
         }
         s.push(']');
         return s;
@@ -122,17 +118,34 @@ fn format_array_repr(arr: &Array<f64, IxDyn>, _prefix: &str) -> String {
     let n = arr.shape()[0];
     for i in 0..n {
         if i > 0 {
-            s.push_str(",\n");
+            s.push_str("\n ");
         }
         let sub = arr.index_axis(Axis(0), i).to_owned().into_dyn();
         let row_str = format_array_repr(&sub, "");
-        s.push_str(" ");
         s.push_str(&row_str);
     }
     s.push_str("]");
     s
 }
 
+fn format_scalar(val: f64) -> String {
+    if val.is_nan() {
+        return "nan".to_string();
+    }
+    if val.is_infinite() {
+        return if val > 0.0 { "inf".to_string() } else { "-inf".to_string() };
+    }
+    if val == val.floor() && val.is_finite() && val.abs() < 1e16 {
+        // 整数值不显示小数点，与 numpy print 输出一致
+        let v = val as i64;
+        if v as f64 == val {
+            return format!("{}", v);
+        }
+    }
+    let s = format!("{}", val);
+    s
+}
+
 /// NdArray: 类似 NumPy ndarray 的多维数组
 #[pyclass(name = "ndarray", from_py_object)]
 #[derive(Clone)]
@@ -161,6 +174,11 @@ impl NdArray {
         Ok(format!("rsnumpy.ndarray({}) dtype=float64", arr_str))
     }
 
+    fn __str__(&self) -> PyResult<String> {
+        let arr_str = format_array_repr(&self.data, "");
+        Ok(arr_str)
+    }
+
     fn __len__(&self) -> PyResult<usize> {
         if self.data.ndim() == 0 {
             return Err(PyTypeError::new_err("len() of unsized object"));