openpoints 0.1.0__tar.gz → 0.1.2__tar.gz

{openpoints-0.1.0/openpoints.egg-info → openpoints-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openpoints
-Version: 0.1.0
+Version: 0.1.2
 Summary: OpenPoints: point cloud understanding models, layers, datasets, transforms, optimizers, and training utilities.
 Author: Guocheng Qian
 License-Expression: MIT

{openpoints-0.1.0 → openpoints-0.1.2}/__init__.py

@@ -1,3 +1,3 @@
-__version__ = "0.1.0"
+__version__ = "0.1.2"
 
 from .transforms import *

{openpoints-0.1.0 → openpoints-0.1.2}/cpp/subsampling/setup.py

@@ -1,5 +1,5 @@
-from distutils.core import setup, Extension
-import numpy.distutils.misc_util
+from setuptools import setup, Extension
+import numpy
 
 # Adding OpenCV to project
 # ************************
@@ -16,9 +16,10 @@ SOURCES = ["cpp_utils/cloud/cloud.cpp",
 module = Extension(m_name,
                    sources=SOURCES,
                    extra_compile_args=['-std=c++11',
-                                       '-D_GLIBCXX_USE_CXX11_ABI=0'])
+                                       '-D_GLIBCXX_USE_CXX11_ABI=0'],
+                   include_dirs=[numpy.get_include()])
 
-setup(ext_modules=[module], include_dirs=numpy.distutils.misc_util.get_numpy_include_dirs())
+setup(name=m_name, ext_modules=[module])
 
 
 

{openpoints-0.1.0/dataset/semantic_kitti/utils/cpp_wrappers/cpp_subsampling → openpoints-0.1.2/cpp/subsampling}/wrapper.cpp

@@ -97,13 +97,13 @@ static PyObject *grid_subsampling_compute(PyObject *self, PyObject *args, PyObje
 		use_classes = false;
 
     // Interpret the input objects as numpy arrays.
-	PyObject *points_array = PyArray_FROM_OTF(points_obj, NPY_FLOAT, NPY_IN_ARRAY);
-	PyObject *features_array = NULL;
-	PyObject *classes_array = NULL;
+	PyArrayObject *points_array = (PyArrayObject*)PyArray_FROM_OTF(points_obj, NPY_FLOAT, NPY_ARRAY_IN_ARRAY);
+	PyArrayObject *features_array = NULL;
+	PyArrayObject *classes_array = NULL;
 	if (use_feature)
-		features_array = PyArray_FROM_OTF(features_obj, NPY_FLOAT, NPY_IN_ARRAY);
+		features_array = (PyArrayObject*)PyArray_FROM_OTF(features_obj, NPY_FLOAT, NPY_ARRAY_IN_ARRAY);
 	if (use_classes)
-		classes_array = PyArray_FROM_OTF(classes_obj, NPY_INT, NPY_IN_ARRAY);
+		classes_array = (PyArrayObject*)PyArray_FROM_OTF(classes_obj, NPY_INT, NPY_ARRAY_IN_ARRAY);
 
 	// Verify data was load correctly.
 	if (points_array == NULL)
@@ -250,18 +250,18 @@ static PyObject *grid_subsampling_compute(PyObject *self, PyObject *args, PyObje
 
 	// Fill output array with values
 	size_t size_in_bytes = subsampled_points.size() * 3 * sizeof(float);
-	memcpy(PyArray_DATA(res_points_obj), subsampled_points.data(), size_in_bytes);
+	memcpy(PyArray_DATA((PyArrayObject*)res_points_obj), subsampled_points.data(), size_in_bytes);
 	if (use_feature)
 	{
 	    size_in_bytes = subsampled_points.size() * fdim * sizeof(float);
 		res_features_obj = PyArray_SimpleNew(2, feature_dims, NPY_FLOAT);
-		memcpy(PyArray_DATA(res_features_obj), subsampled_features.data(), size_in_bytes);
+		memcpy(PyArray_DATA((PyArrayObject*)res_features_obj), subsampled_features.data(), size_in_bytes);
 	}
 	if (use_classes)
 	{
 		size_in_bytes = subsampled_points.size() * ldim * sizeof(int);
 		res_classes_obj = PyArray_SimpleNew(2, classes_dims, NPY_INT);
-		memcpy(PyArray_DATA(res_classes_obj), subsampled_classes.data(), size_in_bytes);
+		memcpy(PyArray_DATA((PyArrayObject*)res_classes_obj), subsampled_classes.data(), size_in_bytes);
 	}
 
 

{openpoints-0.1.0 → openpoints-0.1.2/openpoints.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openpoints
-Version: 0.1.0
+Version: 0.1.2
 Summary: OpenPoints: point cloud understanding models, layers, datasets, transforms, optimizers, and training utilities.
 Author: Guocheng Qian
 License-Expression: MIT

{openpoints-0.1.0 → openpoints-0.1.2}/openpoints.egg-info/SOURCES.txt

@@ -418,6 +418,7 @@ scheduler/step_lr.py
 scheduler/tanh_lr.py
 tests/test_data_util.py
 tests/test_optional_cuda_imports.py
+tests/test_package_metadata.py
 tests/test_pointmlp_hooks.py
 transforms/__init__.py
 transforms/point_transform_cpu.py

{openpoints-0.1.0 → openpoints-0.1.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "openpoints"
-version = "0.1.0"
+version = "0.1.2"
 description = "OpenPoints: point cloud understanding models, layers, datasets, transforms, optimizers, and training utilities."
 readme = "README.md"
 requires-python = ">=3.8"

openpoints-0.1.2/tests/test_package_metadata.py

@@ -0,0 +1,15 @@
+from pathlib import Path
+
+
+def test_pyproject_declares_current_package_layout():
+    root = Path(__file__).resolve().parents[1]
+    pyproject = (root / "pyproject.toml").read_text(encoding="utf-8")
+
+    assert 'name = "openpoints"' in pyproject
+    assert 'version = "0.1.1"' in pyproject
+    assert 'package-dir = { "openpoints" = "." }' in pyproject
+    assert '"openpoints.cpp.chamfer_dist"' in pyproject
+    assert '"openpoints.dataset.semantic_kitti"' in pyproject
+
+    for package_dir in ("cpp", "dataset", "models", "transforms", "utils"):
+        assert (root / package_dir / "__init__.py").is_file()