Move content of the Python pkg to subdirectory python/kvikio/ (#392)

* Move content of the Python pkg to subdirectory python/kvikio/ * Fix copyright year
rapidsai · Jun 10, 2024 · 88033f4 · 88033f4
1 parent 64b5129
commit 88033f4
Show file tree

Hide file tree

Showing 51 changed files with 23 additions and 23 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -18,7 +18,7 @@ repos:
     hooks:
       - id: black
         files: python/.*
-        args: ["--config", "python/pyproject.toml"]
+        args: ["--config", "python/kvikio/pyproject.toml"]
   - repo: https://github.com/PyCQA/flake8
     rev: 6.0.0
     hooks:
@@ -37,11 +37,11 @@ repos:
     hooks:
       - id: mypy
         additional_dependencies: [types-cachetools]
-        args: ["--config-file=python/pyproject.toml",
-                "python/kvikio",
-                "python/tests",
-                "python/examples",
-                "python/benchmarks"]
+        args: ["--config-file=python/kvikio/pyproject.toml",
+                "python/kvikio/kvikio",
+                "python/kvikio/tests",
+                "python/kvikio/examples",
+                "python/kvikio/benchmarks"]
         pass_filenames: false
   - repo: https://github.com/pre-commit/mirrors-clang-format
     rev: v16.0.6

diff --git a/build.sh b/build.sh
@@ -151,7 +151,7 @@ fi
 # Build and install the kvikio Python package
 if (( NUMARGS == 0 )) || hasArg kvikio; then
     echo "building kvikio..."
-    cd ${REPODIR}/python
+    cd ${REPODIR}/python/kvikio
     SKBUILD_CMAKE_ARGS="-DCMAKE_PREFIX_PATH=${INSTALL_PREFIX};-DCMAKE_LIBRARY_PATH=${LIBKVIKIO_BUILD_DIR};${EXTRA_CMAKE_ARGS}" \
         python -m pip install --no-build-isolation --no-deps --config-settings rapidsai.disable-cuda=true .
 fi
diff --git a/ci/run_pytests.sh b/ci/run_pytests.sh
@@ -4,6 +4,6 @@
 set -euo pipefail
 
 # Support invoking run_pytests.sh outside the script directory
-cd "$(dirname "$(realpath "${BASH_SOURCE[0]}")")"/../python/
+cd "$(dirname "$(realpath "${BASH_SOURCE[0]}")")"/../python/kvikio
 
 pytest --cache-clear --verbose "$@" tests
diff --git a/dependencies.yaml b/dependencies.yaml
@@ -39,30 +39,30 @@ files:
       - py_version
   py_build:
     output: pyproject
-    pyproject_dir: python
+    pyproject_dir: python/kvikio
     extras:
       table: build-system
     includes:
       - rapids_build_skbuild
   py_rapids_build:
     output: pyproject
-    pyproject_dir: python
+    pyproject_dir: python/kvikio
     extras:
       table: tool.rapids-build-backend
       key: requires
     includes:
       - build
   py_run:
     output: pyproject
-    pyproject_dir: python
+    pyproject_dir: python/kvikio
     extras:
       table: project
     includes:
       - depends_on_cupy
       - run
   py_optional_test:
     output: pyproject
-    pyproject_dir: python
+    pyproject_dir: python/kvikio
     extras:
       table: project.optional-dependencies
       key: test

diff --git a/docs/source/zarr.rst b/docs/source/zarr.rst
@@ -11,5 +11,5 @@ The following is an example of how to use the convenience function :py:meth:`kvi
 to create a new Zarr array and how open an existing Zarr array.
 
 
-.. literalinclude:: ../../python/examples/zarr_cupy_nvcomp.py
+.. literalinclude:: ../../python/kvikio/examples/zarr_cupy_nvcomp.py
     :language: python
diff --git a/python/README.md b/python/README.md
diff --git a/python/.coveragerc → python/kvikio/.coveragerc b/python/.coveragerc → python/kvikio/.coveragerc
diff --git a/python/CMakeLists.txt → python/kvikio/CMakeLists.txt b/python/CMakeLists.txt → python/kvikio/CMakeLists.txt
@@ -14,7 +14,7 @@
 
 cmake_minimum_required(VERSION 3.26.4 FATAL_ERROR)
 
-include(../cpp/cmake/rapids_config.cmake)
+include(../../cpp/cmake/rapids_config.cmake)
 include(rapids-cpm)
 rapids_cpm_init()
 include(rapids-cuda)
@@ -31,7 +31,7 @@ option(FIND_KVIKIO_CPP
 )
 
 # TODO: Should we symlink FindcuFile.cmake into python/cmake? find cuFile
-include(../cpp/cmake/Modules/FindcuFile.cmake)
+include(../../cpp/cmake/Modules/FindcuFile.cmake)
 
 if(FIND_KVIKIO_CPP)
   find_package(KvikIO "${RAPIDS_VERSION}")
@@ -42,7 +42,7 @@ endif()
 find_package(CUDAToolkit REQUIRED)
 
 if(NOT KvikIO_FOUND)
-  add_subdirectory(../cpp kvikio-cpp)
+  add_subdirectory(../../cpp kvikio-cpp)
   set(cython_lib_dir kvikio)
   install(TARGETS kvikio DESTINATION ${cython_lib_dir})
 endif()

diff --git a/python/kvikio/README.md b/python/kvikio/README.md
@@ -0,0 +1 @@
+../../README.md
diff --git a/python/kvikio/VERSION b/python/kvikio/VERSION
diff --git a/python/benchmarks/single-node-io.py → python/kvikio/benchmarks/single-node-io.py b/python/benchmarks/single-node-io.py → python/kvikio/benchmarks/single-node-io.py
diff --git a/python/benchmarks/zarr-io.py → python/kvikio/benchmarks/zarr-io.py b/python/benchmarks/zarr-io.py → python/kvikio/benchmarks/zarr-io.py
diff --git a/python/cli/gpu_compressor.py → python/kvikio/cli/gpu_compressor.py b/python/cli/gpu_compressor.py → python/kvikio/cli/gpu_compressor.py
diff --git a/python/cmake/CMakeLists.txt → python/kvikio/cmake/CMakeLists.txt b/python/cmake/CMakeLists.txt → python/kvikio/cmake/CMakeLists.txt
diff --git a/python/cmake/thirdparty/get_nvcomp.cmake → .../kvikio/cmake/thirdparty/get_nvcomp.cmake b/python/cmake/thirdparty/get_nvcomp.cmake → .../kvikio/cmake/thirdparty/get_nvcomp.cmake
diff --git a/python/examples/hello_world.py → python/kvikio/examples/hello_world.py b/python/examples/hello_world.py → python/kvikio/examples/hello_world.py
diff --git a/python/examples/zarr_cupy_nvcomp.py → python/kvikio/examples/zarr_cupy_nvcomp.py b/python/examples/zarr_cupy_nvcomp.py → python/kvikio/examples/zarr_cupy_nvcomp.py
diff --git a/python/kvikio/kvikio/VERSION b/python/kvikio/kvikio/VERSION
@@ -0,0 +1 @@
+../../../VERSION
diff --git a/python/kvikio/__init__.py → python/kvikio/kvikio/__init__.py b/python/kvikio/__init__.py → python/kvikio/kvikio/__init__.py
diff --git a/python/kvikio/_lib/CMakeLists.txt → python/kvikio/kvikio/_lib/CMakeLists.txt b/python/kvikio/_lib/CMakeLists.txt → python/kvikio/kvikio/_lib/CMakeLists.txt
diff --git a/python/kvikio/_lib/__init__.pxd → python/kvikio/kvikio/_lib/__init__.pxd b/python/kvikio/_lib/__init__.pxd → python/kvikio/kvikio/_lib/__init__.pxd
diff --git a/python/kvikio/_lib/__init__.py → python/kvikio/kvikio/_lib/__init__.py b/python/kvikio/_lib/__init__.py → python/kvikio/kvikio/_lib/__init__.py
diff --git a/python/kvikio/_lib/arr.pxd → python/kvikio/kvikio/_lib/arr.pxd b/python/kvikio/_lib/arr.pxd → python/kvikio/kvikio/_lib/arr.pxd
diff --git a/python/kvikio/_lib/arr.pyi → python/kvikio/kvikio/_lib/arr.pyi b/python/kvikio/_lib/arr.pyi → python/kvikio/kvikio/_lib/arr.pyi
diff --git a/python/kvikio/_lib/arr.pyx → python/kvikio/kvikio/_lib/arr.pyx b/python/kvikio/_lib/arr.pyx → python/kvikio/kvikio/_lib/arr.pyx
diff --git a/python/kvikio/_lib/kvikio_cxx_api.pxd → python/kvikio/kvikio/_lib/kvikio_cxx_api.pxd b/python/kvikio/_lib/kvikio_cxx_api.pxd → python/kvikio/kvikio/_lib/kvikio_cxx_api.pxd
diff --git a/python/kvikio/_lib/libkvikio.pyx → python/kvikio/kvikio/_lib/libkvikio.pyx b/python/kvikio/_lib/libkvikio.pyx → python/kvikio/kvikio/_lib/libkvikio.pyx
diff --git a/python/kvikio/_lib/libnvcomp.pyx → python/kvikio/kvikio/_lib/libnvcomp.pyx b/python/kvikio/_lib/libnvcomp.pyx → python/kvikio/kvikio/_lib/libnvcomp.pyx
diff --git a/python/kvikio/_lib/libnvcomp_ll.pyx → python/kvikio/kvikio/_lib/libnvcomp_ll.pyx b/python/kvikio/_lib/libnvcomp_ll.pyx → python/kvikio/kvikio/_lib/libnvcomp_ll.pyx
diff --git a/python/kvikio/_lib/nvcomp_cxx_api.pxd → python/kvikio/kvikio/_lib/nvcomp_cxx_api.pxd b/python/kvikio/_lib/nvcomp_cxx_api.pxd → python/kvikio/kvikio/_lib/nvcomp_cxx_api.pxd
diff --git a/python/kvikio/_lib/nvcomp_ll_cxx_api.pxd → .../kvikio/kvikio/_lib/nvcomp_ll_cxx_api.pxd b/python/kvikio/_lib/nvcomp_ll_cxx_api.pxd → .../kvikio/kvikio/_lib/nvcomp_ll_cxx_api.pxd
diff --git a/python/kvikio/_version.py → python/kvikio/kvikio/_version.py b/python/kvikio/_version.py → python/kvikio/kvikio/_version.py
diff --git a/python/kvikio/cufile.py → python/kvikio/kvikio/cufile.py b/python/kvikio/cufile.py → python/kvikio/kvikio/cufile.py
diff --git a/python/kvikio/defaults.py → python/kvikio/kvikio/defaults.py b/python/kvikio/defaults.py → python/kvikio/kvikio/defaults.py
diff --git a/python/kvikio/numcodecs.py → python/kvikio/kvikio/numcodecs.py b/python/kvikio/numcodecs.py → python/kvikio/kvikio/numcodecs.py
diff --git a/python/kvikio/numpy.py → python/kvikio/kvikio/numpy.py b/python/kvikio/numpy.py → python/kvikio/kvikio/numpy.py
diff --git a/python/kvikio/nvcomp.py → python/kvikio/kvikio/nvcomp.py b/python/kvikio/nvcomp.py → python/kvikio/kvikio/nvcomp.py
diff --git a/python/kvikio/nvcomp_codec.py → python/kvikio/kvikio/nvcomp_codec.py b/python/kvikio/nvcomp_codec.py → python/kvikio/kvikio/nvcomp_codec.py
diff --git a/python/kvikio/zarr.py → python/kvikio/kvikio/zarr.py b/python/kvikio/zarr.py → python/kvikio/kvikio/zarr.py
diff --git a/python/pyproject.toml → python/kvikio/pyproject.toml b/python/pyproject.toml → python/kvikio/pyproject.toml
@@ -1,12 +1,12 @@
-# Copyright (c) 2021-2022, NVIDIA CORPORATION. All rights reserved.
+# Copyright (c) 2021-2024, NVIDIA CORPORATION. All rights reserved.
 # See file LICENSE for terms.
 
 [build-system]
 build-backend = "rapids_build_backend.build"
 requires = [
     "rapids-build-backend>=0.3.0,<0.4.0.dev0",
     "scikit-build-core[pyproject]>=0.7.0",
-] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../dependencies.yaml and run `rapids-dependency-file-generator`.
+] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
 
 [project]
 name = "kvikio"
@@ -24,7 +24,7 @@ dependencies = [
     "numpy>=1.23,<2.0a0",
     "packaging",
     "zarr",
-] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../dependencies.yaml and run `rapids-dependency-file-generator`.
+] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
 classifiers = [
     "Intended Audience :: Developers",
     "Topic :: Database",
@@ -42,7 +42,7 @@ test = [
     "dask>=2022.05.2",
     "pytest",
     "pytest-cov",
-] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../dependencies.yaml and run `rapids-dependency-file-generator`.
+] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
 
 [project.urls]
 Homepage = "https://github.com/rapidsai/kvikio"
@@ -114,7 +114,7 @@ requires = [
     "cmake>=3.26.4",
     "cython>=3.0.0",
     "ninja",
-] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../dependencies.yaml and run `rapids-dependency-file-generator`.
+] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
 
 [tool.scikit-build]
 build-dir = "build/{wheel_tag}"

diff --git a/python/tests/conftest.py → python/kvikio/tests/conftest.py b/python/tests/conftest.py → python/kvikio/tests/conftest.py
diff --git a/python/tests/test_async_io.py → python/kvikio/tests/test_async_io.py b/python/tests/test_async_io.py → python/kvikio/tests/test_async_io.py
diff --git a/python/tests/test_basic_io.py → python/kvikio/tests/test_basic_io.py b/python/tests/test_basic_io.py → python/kvikio/tests/test_basic_io.py
diff --git a/python/tests/test_benchmarks.py → python/kvikio/tests/test_benchmarks.py b/python/tests/test_benchmarks.py → python/kvikio/tests/test_benchmarks.py
diff --git a/python/tests/test_defaults.py → python/kvikio/tests/test_defaults.py b/python/tests/test_defaults.py → python/kvikio/tests/test_defaults.py
diff --git a/python/tests/test_examples.py → python/kvikio/tests/test_examples.py b/python/tests/test_examples.py → python/kvikio/tests/test_examples.py
diff --git a/python/tests/test_numpy.py → python/kvikio/tests/test_numpy.py b/python/tests/test_numpy.py → python/kvikio/tests/test_numpy.py
diff --git a/python/tests/test_nvcomp.py → python/kvikio/tests/test_nvcomp.py b/python/tests/test_nvcomp.py → python/kvikio/tests/test_nvcomp.py
diff --git a/python/tests/test_nvcomp_codec.py → python/kvikio/tests/test_nvcomp_codec.py b/python/tests/test_nvcomp_codec.py → python/kvikio/tests/test_nvcomp_codec.py
diff --git a/python/tests/test_version.py → python/kvikio/tests/test_version.py b/python/tests/test_version.py → python/kvikio/tests/test_version.py
diff --git a/python/tests/test_zarr.py → python/kvikio/tests/test_zarr.py b/python/tests/test_zarr.py → python/kvikio/tests/test_zarr.py