restructure for pip install

cai4cai · Aug 2, 2023 · 4bbddbb · 4bbddbb
1 parent 2f019b7
commit 4bbddbb
Show file tree

Hide file tree

Showing 22 changed files with 25 additions and 6 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -0,0 +1 @@
+recursive-include torchsparsegradutils/tests *.yaml
diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ Things that are missing may be listed as [issues](https://github.com/cai4cai/tor
 ## Installation
 The provided package can be installed using:
 
-`pip install torchsparsegradutils` (TODO)
+`pip install torchsparsegradutils`
 
 or
 

diff --git a/setup.py b/setup.py
@@ -8,15 +8,18 @@ def readme():
 
 setuptools.setup(
     name="torchsparsegradutils",
-    version="0.0.3",
+    version="0.1.0",
     description="A collection of utility functions to work with PyTorch sparse tensors",
     long_description=readme(),
     long_description_content_type="text/markdown",
     classifiers=[
         "Operating System :: OS Independent",
         "License :: OSI Approved :: Apache Software License",
-        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
     ],
+    python_requires=">=3.8, <3.11",
     keywords="sparse torch utility",
     url="https://github.com/cai4cai/torchsparsegradutils",
     author="CAI4CAI research group",
@@ -26,8 +29,12 @@ def readme():
     install_requires=[
         "torch>=1.13",
     ],
+    setup_requires=["pytest-runner"],
+    tests_require=["pytest"],
+    test_suite="tests",
     extras_require={
         "extras": ["jax", "cupy"],
     },
     zip_safe=False,
+    include_package_data=True,
 )
diff --git a/tests/__init__.py → torchsparsegradutils/tests/__init__.py b/tests/__init__.py → torchsparsegradutils/tests/__init__.py
diff --git a/tests/test_bicgstab.py → torchsparsegradutils/tests/test_bicgstab.py b/tests/test_bicgstab.py → torchsparsegradutils/tests/test_bicgstab.py
diff --git a/tests/test_cupy_bindings.py → ...arsegradutils/tests/test_cupy_bindings.py b/tests/test_cupy_bindings.py → ...arsegradutils/tests/test_cupy_bindings.py
diff --git a/tests/test_cupy_sparse_solve.py → ...gradutils/tests/test_cupy_sparse_solve.py b/tests/test_cupy_sparse_solve.py → ...gradutils/tests/test_cupy_sparse_solve.py
diff --git a/tests/test_distributions.py → ...arsegradutils/tests/test_distributions.py b/tests/test_distributions.py → ...arsegradutils/tests/test_distributions.py
diff --git a/tests/test_encoders.py → torchsparsegradutils/tests/test_encoders.py b/tests/test_encoders.py → torchsparsegradutils/tests/test_encoders.py
@@ -3,6 +3,7 @@
 import json
 import yaml
 import os
+from pathlib import Path
 from ast import literal_eval
 
 from functools import reduce
@@ -152,7 +153,13 @@ def test_trim(tensor_nd, offsets, expected_output_slice):
 
 # Test neighbourgood coordinate generation:
 
-with open("tests/test_params/xyz_coords.yaml") as f:  # load test cases from file
+# Get the absolute path to the directory of the current module:
+current_dir = Path(os.path.abspath(os.path.dirname(__file__)))
+
+# Construct the path to the yaml file:
+yaml_file = current_dir / "test_params" / "xyz_coords.yaml"
+
+with open(yaml_file) as f:  # load test cases from file
     coord_test_cases = yaml.safe_load(f)
 
 params = [tuple(tc.values())[1:] for tc in coord_test_cases]  # Skip the first value, which is 'id'
@@ -172,7 +179,9 @@ def test_gen_coords(radius, expected_coords):
 
 # Test neighbourgood offset generation:
 
-with open("tests/test_params/czyx_shifts.yaml") as f:  # load test cases from file
+yaml_file = current_dir / "test_params" / "czyx_shifts.yaml"
+
+with open(yaml_file) as f:  # load test cases from file
     shift_test_cases = yaml.safe_load(f)
 
 params = [tuple(tc.values())[1:] for tc in shift_test_cases]  # Skip the first value, which is 'id'
@@ -252,7 +261,9 @@ def test_pairwise_coo_indices_unique(radius, volume_shape, diag, upper, channel_
 
 # Test the indices generated are as expected for a simple (3, 2, 2, 2) volume:
 
-with open("tests/test_params/pairwise_coo_indices.yaml") as f:  # load test cases from file to avoid a massive mess
+yaml_file = current_dir / "test_params" / "pairwise_coo_indices.yaml"
+
+with open(yaml_file) as f:  # load test cases from file to avoid a massive mess
     data = yaml.safe_load(f)
 
 test_cases = data["test_cases"]

diff --git a/tests/test_jax_bindings.py → ...parsegradutils/tests/test_jax_bindings.py b/tests/test_jax_bindings.py → ...parsegradutils/tests/test_jax_bindings.py
diff --git a/tests/test_jax_sparse_solve.py → ...egradutils/tests/test_jax_sparse_solve.py b/tests/test_jax_sparse_solve.py → ...egradutils/tests/test_jax_sparse_solve.py
diff --git a/tests/test_linear_cg.py → torchsparsegradutils/tests/test_linear_cg.py b/tests/test_linear_cg.py → torchsparsegradutils/tests/test_linear_cg.py
diff --git a/tests/test_lsmr.py → torchsparsegradutils/tests/test_lsmr.py b/tests/test_lsmr.py → torchsparsegradutils/tests/test_lsmr.py
diff --git a/tests/test_minres.py → torchsparsegradutils/tests/test_minres.py b/tests/test_minres.py → torchsparsegradutils/tests/test_minres.py
diff --git a/tests/test_params/czyx_shifts.yaml → ...dutils/tests/test_params/czyx_shifts.yaml b/tests/test_params/czyx_shifts.yaml → ...dutils/tests/test_params/czyx_shifts.yaml
diff --git a/tests/test_params/pairwise_coo_indices.yaml → ...sts/test_params/pairwise_coo_indices.yaml b/tests/test_params/pairwise_coo_indices.yaml → ...sts/test_params/pairwise_coo_indices.yaml
diff --git a/tests/test_params/xyz_coords.yaml → ...adutils/tests/test_params/xyz_coords.yaml b/tests/test_params/xyz_coords.yaml → ...adutils/tests/test_params/xyz_coords.yaml
diff --git a/tests/test_random.py → torchsparsegradutils/tests/test_random.py b/tests/test_random.py → torchsparsegradutils/tests/test_random.py
diff --git a/tests/test_sparse_lstsq.py → ...parsegradutils/tests/test_sparse_lstsq.py b/tests/test_sparse_lstsq.py → ...parsegradutils/tests/test_sparse_lstsq.py
diff --git a/tests/test_sparse_matmul.py → ...arsegradutils/tests/test_sparse_matmul.py b/tests/test_sparse_matmul.py → ...arsegradutils/tests/test_sparse_matmul.py
diff --git a/tests/test_sparse_solve.py → ...parsegradutils/tests/test_sparse_solve.py b/tests/test_sparse_solve.py → ...parsegradutils/tests/test_sparse_solve.py
diff --git a/tests/test_utils.py → torchsparsegradutils/tests/test_utils.py b/tests/test_utils.py → torchsparsegradutils/tests/test_utils.py