Merge pull request #7956 from kmaehashi/third-party-submodules

Reorganize third party code under `third_party` directory

.gitmodules

@@ -1,6 +1,9 @@
-[submodule "cupy/_core/include/cupy/jitify"]
-	path = cupy/_core/include/cupy/jitify
-	url = https://github.com/NVIDIA/jitify.git
-[submodule "cupy/_core/include/cupy/cccl"]
+[submodule "third_party/cccl"]
 	path = third_party/cccl
 	url = https://github.com/NVIDIA/cccl.git
+[submodule "third_party/jitify"]
+	path = third_party/jitify
+	url = https://github.com/NVIDIA/jitify.git
+[submodule "third_party/dlpack"]
+	path = third_party/dlpack
+	url = https://github.com/dmlc/dlpack.git

cupy/_core/dlpack.pxd

@@ -1,7 +1,7 @@
 from cupy._core.core cimport _ndarray_base
 
 
-cdef extern from './include/cupy/dlpack/dlpack.h' nogil:
+cdef extern from './include/cupy/_dlpack/dlpack.h' nogil:
     int device_CUDA 'kDLCUDA'
     int managed_CUDA 'kDLCUDAManaged'
     int device_ROCM 'kDLROCM'

cupy/_core/dlpack.pyx

@@ -20,7 +20,7 @@ import cupy
 import cupy._core.core as core
 
 
-cdef extern from './include/cupy/dlpack/dlpack.h' nogil:
+cdef extern from './include/cupy/_dlpack/dlpack.h' nogil:
     cdef int DLPACK_VERSION
 
     cdef enum DLDeviceType:

cupy/_core/include/cupy/README.md

@@ -1,15 +1,5 @@
 # "include" directory
 
 All files and directories in this directory will be copied to the distribution (sdist and wheel).
-Note that items starting with `.` (e.g., `cub/.git`) are excluded.
+Note that items starting with `.` (e.g., `.git`) are excluded.
 See `setup.py` for details.
-
-## Jitify
-The `Jitify` folder is a git submodule for the Jitify project.
-Including the Jitify header as a submodule for building the `cupy.cuda.jitify` module.
-For further information on Jitify, see the [Jitify repo](https://github.com/NVIDIA/jitify).
-
-## DLPack
-The `dlpack` folder stores the DLPack header for building the `cupy._core.dlpack` module,
-see `README.md` therein.
-For further information on DLPack, see the [DLPack repo](https://github.com/dmlc/dlpack).

cupy/_core/include/cupy/_dlpack/LICENSE

@@ -0,0 +1 @@
+../../../../../third_party/dlpack/LICENSE

cupy/_core/include/cupy/_dlpack/dlpack.h

@@ -0,0 +1 @@
+../../../../../third_party/dlpack/include/dlpack/dlpack.h

cupy/_core/include/cupy/_jitify/LICENSE

@@ -0,0 +1 @@
+../../../../../third_party/jitify/LICENSE

cupy/_core/include/cupy/_jitify/jitify.hpp

@@ -0,0 +1 @@
+../../../../../third_party/jitify/jitify.hpp

cupy/cuda/cupy_jitify.h

@@ -6,7 +6,7 @@
 
 #if !defined(CUPY_NO_CUDA) && !defined(CUPY_USE_HIP)
 
-#include <cupy/jitify/jitify.hpp>
+#include <cupy/_jitify/jitify.hpp>
 namespace jitify {
 namespace detail {
 const char* jitify_ver = _xstr_(CUPY_JITIFY_VERSION_CODE);

install/cupy_builder/_features.py

@@ -413,7 +413,7 @@ def get_features(ctx: Context) -> Dict[str, Feature]:
             'cupy._core.dlpack',
         ],
         'include': [
-            'cupy/dlpack/dlpack.h',
+            'cupy/_dlpack/dlpack.h',
         ],
         'libraries': [],
     }

install/cupy_builder/_preflight.py

@@ -12,7 +12,8 @@ def preflight_check(ctx: Context) -> bool:
     source_root = ctx.source_root
     is_git = os.path.isdir(os.path.join(source_root, '.git'))
     for submodule in ('third_party/cccl',
-                      'cupy/_core/include/cupy/jitify'):
+                      'third_party/jitify',
+                      'third_party/dlpack'):
         dirpath = os.path.join(source_root, submodule)
         if os.path.isdir(dirpath):
             if 0 < len(os.listdir(dirpath)):

install/cupy_builder/cupy_setup_build.py

@@ -362,11 +362,11 @@ def make_extensions(ctx: Context, compiler, use_cython):
             # compile_args.append('-DJITIFY_PRINT_ALL')
 
             # if any change is made to the Jitify header, we force recompiling
-            s['depends'] = ['./cupy/_core/include/cupy/jitify/jitify.hpp']
+            s['depends'] = ['./cupy/_core/include/cupy/_jitify/jitify.hpp']
 
         if module['name'] == 'dlpack':
             # if any change is made to the DLPack header, we force recompiling
-            s['depends'] = ['./cupy/_core/include/cupy/dlpack/dlpack.h']
+            s['depends'] = ['./cupy/_core/include/cupy/_dlpack/dlpack.h']
 
         for f in module['file']:
             s_file = copy.deepcopy(s)

install/cupy_builder/install_build.py

@@ -178,7 +178,7 @@ def get_compiler_setting(ctx: Context, use_hip):
     cupy_header = os.path.join(
         cupy_builder.get_context().source_root, 'cupy/_core/include')
     global _jitify_path
-    _jitify_path = os.path.join(cupy_header, 'cupy/jitify')
+    _jitify_path = os.path.join(cupy_header, 'cupy/_jitify')
     global _cub_path
     if rocm_path:
         _cub_path = os.path.join(rocm_path, 'include', 'hipcub')

third_party/README.md

@@ -5,3 +5,15 @@
 The `cccl` folder is a git submodule for the CCCL project, the new home for Thrust, CUB, and
 libcu++. The CCCL headers are used at both build- and run- time.
 For further information on CUB, see the [CCCL repo](https://github.com/NVIDIA/cccl).
+
+## Jitify
+
+The `jitify` folder is a git submodule for the Jitify project.
+Including the Jitify header as a submodule for building the `cupy.cuda.jitify` module.
+For further information on Jitify, see the [Jitify repo](https://github.com/NVIDIA/jitify).
+
+## DLPack
+
+The `dlpack` folder is a git submodule for the DLPack project.
+Including the Jitify header as a submodule for building the `cupy._core.dlpack` module.
+For further information on DLPack, see the [DLPack repo](https://github.com/dmlc/dlpack).