refactor: rename numpy/ → numpycpp/ (match install prefix /usr/include/numpycpp)

peng.li24 · peng.li24 · commit cfb18482bd28 · 2026-06-09T17:15:33.000+08:00
Now all headers live inside numpycpp/:
  #include &lt;numpycpp/numpy.h&gt;           # C++ core umbrella
  #include &lt;numpycpp/numpy_py.h&gt;        # pybind11 umbrella
  #include &lt;numpycpp/numpycpp/init.h&gt;   # individual modules

Updated all internal includes, CMake install rules, detail header comments,
test build config, bench, and example.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -41,7 +41,7 @@ else()
 endif()
 
 # ---- Install — header-only C++ library --------------------------------------
-install(DIRECTORY numpy
+install(DIRECTORY numpycpp
     DESTINATION include/numpycpp
     FILES_MATCHING PATTERN "*.h"
     PATTERN ".pytest_cache" EXCLUDE
diff --git a/bench/bench_core.cpp b/bench/bench_core.cpp
@@ -1,5 +1,5 @@
-#include "numpy/numpy.h"
-#include "numpy/linalg.h"
+#include "numpycpp/numpy.h"
+#include "numpycpp/linalg.h"
 #include <benchmark/benchmark.h>
 #include <vector>
 #include <random>
diff --git a/example/main.cpp b/example/main.cpp
@@ -1,4 +1,4 @@
-#include <numpy/numpy.h>
+#include <numpycpp/numpy.h>
 #include <iostream>
 #include <vector>
 
diff --git a/numpy/numpy.h b/numpy/numpy.h
diff --git a/numpycpp/detail/avx512_loops.h b/numpycpp/detail/avx512_loops.h
@@ -6,7 +6,7 @@
 // ║  be included INSIDE namespace numpy at end of elementwise.h — nowhere else.║
 // ║                                                                          ║
 // ║  ✗  #include "numpy/detail/avx512_loops.h"     ← compile error                ║
-// ║  ✓  #include "numpy/numpy.h"             ← recommended entry point      ║
+// ║  ✓  #include "numpycpp/numpy.h"             ← recommended entry point      ║
 // ╚══════════════════════════════════════════════════════════════════════════╝
 //
 // AVX-512 wide-loop specializations for array math functions.
@@ -29,7 +29,7 @@
 
 #ifndef NUMPYCPP_INTERNAL_INCLUDE
 #  error "avx512_loops.h is an internal header — do not include directly. \
-Use #include "numpy/numpy.h" instead."
+Use #include "numpycpp/numpy.h" instead."
 #endif
 
 #ifdef __AVX512F__
diff --git a/numpycpp/detail/blas_bridge.h b/numpycpp/detail/blas_bridge.h
@@ -7,7 +7,7 @@
 // ║                                                                          ║
 // ║  ✗  #include "numpy/detail/blas_bridge.h"      ← compile error                ║
 // ║  ✗  numpy::detail::blas_sdot(...)       ← undefined behaviour          ║
-// ║  ✓  #include "numpy/numpy.h"             ← recommended entry point      ║
+// ║  ✓  #include "numpycpp/numpy.h"             ← recommended entry point      ║
 // ║  ✓  numpy::dot(a, b, n)                 ← public API                    ║
 // ╚══════════════════════════════════════════════════════════════════════════╝
 //
@@ -34,7 +34,7 @@
 
 #ifndef NUMPYCPP_INTERNAL_INCLUDE
 #  error "blas_bridge.h is an internal header — do not include directly. \
-Use #include "numpy/numpy.h" instead."
+Use #include "numpycpp/numpy.h" instead."
 #endif
 
 #include <cstdint>
diff --git a/numpycpp/detail/macros.h b/numpycpp/detail/macros.h
diff --git a/numpycpp/detail/npy_math_float.h b/numpycpp/detail/npy_math_float.h
@@ -6,14 +6,14 @@
 // ║  subject to change without notice.                                       ║
 // ║                                                                          ║
 // ║  ✗  #include "numpy/detail/npy_math_float.h"   ← compile error                ║
-// ║  ✓  #include "numpy/numpy.h"            ← only correct entry point      ║
+// ║  ✓  #include "numpycpp/numpy.h"            ← only correct entry point      ║
 // ╚══════════════════════════════════════════════════════════════════════════╝
 
 #pragma once
 
 #ifndef NUMPYCPP_INTERNAL_INCLUDE
 #  error "npy_math_float.h is an internal header — do not include directly. \
-Use #include \"numpy/numpy.h\" instead."
+Use #include \"numpycpp/numpy.h\" instead."
 #endif
 
 #include <cstdint>
diff --git a/numpycpp/detail/std_linalg_backend.h b/numpycpp/detail/std_linalg_backend.h
@@ -6,7 +6,7 @@
 // ║  but uses only C++ loops — no dlopen, no OpenBLAS, no Fortran ABI.     ║
 // ║                                                                          ║
 // ║  ✗  #include "numpy/detail/std_linalg_backend.h"  ← compile error      ║
-// ║  ✓  #include "numpy/numpy.h"                      ← entry point         ║
+// ║  ✓  #include "numpycpp/numpy.h"                      ← entry point         ║
 // ║  ✓  cmake … -DNUMPYCPP_STD_ONLY=ON               ← selects this backend║
 // ╚══════════════════════════════════════════════════════════════════════════╝
 //
@@ -23,7 +23,7 @@
 
 #ifndef NUMPYCPP_INTERNAL_INCLUDE
 #  error "std_linalg_backend.h is an internal header — do not include directly. \
-Use #include \"numpy/numpy.h\" instead."
+Use #include \"numpycpp/numpy.h\" instead."
 #endif
 
 #include <cmath>
diff --git a/numpycpp/detail/std_math_backend.h b/numpycpp/detail/std_math_backend.h
@@ -6,7 +6,7 @@
 // ║  only <cmath> — no dlopen, no SVML, no AVX-512, no numpy dependency.   ║
 // ║                                                                          ║
 // ║  ✗  #include "numpy/detail/std_math_backend.h"  ← compile error        ║
-// ║  ✓  #include "numpy/numpy.h"                    ← entry point           ║
+// ║  ✓  #include "numpycpp/numpy.h"                    ← entry point           ║
 // ║  ✓  cmake … -DNUMPYCPP_STD_ONLY=ON             ← selects this backend  ║
 // ╚══════════════════════════════════════════════════════════════════════════╝
 //
@@ -24,7 +24,7 @@
 
 #ifndef NUMPYCPP_INTERNAL_INCLUDE
 #  error "std_math_backend.h is an internal header — do not include directly. \
-Use #include \"numpy/numpy.h\" instead."
+Use #include \"numpycpp/numpy.h\" instead."
 #endif
 
 #include <cmath>
diff --git a/numpycpp/detail/svml_bridge.h b/numpycpp/detail/svml_bridge.h
@@ -8,7 +8,7 @@
 // ║                                                                          ║
 // ║  ✗  #include "numpy/detail/svml_bridge.h"      ← compile error                ║
 // ║  ✗  numpy::detail::exp_svml_f64(x)      ← undefined behaviour          ║
-// ║  ✓  #include "numpy/numpy.h"             ← recommended entry point      ║
+// ║  ✓  #include "numpycpp/numpy.h"             ← recommended entry point      ║
 // ║  ✓  numpy::exp(src, dst, n)             ← public API                    ║
 // ╚══════════════════════════════════════════════════════════════════════════╝
 //
@@ -23,7 +23,7 @@
 
 #ifndef NUMPYCPP_INTERNAL_INCLUDE
 #  error "svml_bridge.h is an internal header — do not include directly. \
-Use #include "numpy/numpy.h" instead."
+Use #include "numpycpp/numpy.h" instead."
 #endif
 
 #include <cmath>
diff --git a/numpycpp/elementwise.h b/numpycpp/elementwise.h
diff --git a/numpycpp/elementwise_py.h b/numpycpp/elementwise_py.h
@@ -14,7 +14,7 @@
 
 #include <pybind11/pybind11.h>
 #include <pybind11/numpy.h>
-#include "../numpy/numpy.h"
+#include "numpy.h"
 #include <algorithm>
 #include <stdexcept>
 #include <cstdint>
diff --git a/numpycpp/init.h b/numpycpp/init.h
diff --git a/numpycpp/init_py.h b/numpycpp/init_py.h
@@ -11,7 +11,7 @@
 #include <pybind11/pybind11.h>
 #include <pybind11/numpy.h>
 #include <pybind11/stl.h>
-#include "../numpy/numpy.h"
+#include "numpy.h"
 #include <algorithm>
 #include <stdexcept>
 
diff --git a/numpycpp/io.h b/numpycpp/io.h
diff --git a/numpycpp/io_py.h b/numpycpp/io_py.h
@@ -12,7 +12,7 @@
 #include <pybind11/pybind11.h>
 #include <pybind11/numpy.h>
 #include <pybind11/stl.h>
-#include "../numpy/numpy.h"
+#include "numpy.h"
 #include <algorithm>
 #include <vector>
 
diff --git a/numpycpp/linalg.h b/numpycpp/linalg.h
diff --git a/numpycpp/linalg_py.h b/numpycpp/linalg_py.h
@@ -4,7 +4,7 @@
 
 #include <pybind11/pybind11.h>
 #include <pybind11/numpy.h>
-#include "../numpy/numpy.h"
+#include "numpy.h"
 
 namespace py = pybind11;
 
diff --git a/numpycpp/manipulation.h b/numpycpp/manipulation.h
diff --git a/numpycpp/manipulation_py.h b/numpycpp/manipulation_py.h
@@ -18,7 +18,7 @@
 #include <pybind11/pybind11.h>
 #include <pybind11/numpy.h>
 #include <pybind11/stl.h>
-#include "../numpy/numpy.h"
+#include "numpy.h"
 #include <algorithm>
 #include <cstring>
 #include <stdexcept>
diff --git a/numpycpp/numpy.h b/numpycpp/numpy.h
@@ -0,0 +1,25 @@
+// ════════════════════════════════════════════════════════════════════════════
+//  numpycpp — numpycpp/numpy.h                             [PUBLIC HEADER]
+//
+//  Single umbrella header — includes all numpycpp C++ core modules.
+//
+//  Usage:
+//      #include <numpycpp/numpy.h>
+//
+//  Or include individual modules as needed:
+//      #include <numpycpp/numpycpp/init.h>         // zeros_like, ones_like, full
+//      #include <numpycpp/numpycpp/elementwise.h>  // sqrt, exp, sin, astype, …
+//      #include <numpycpp/numpycpp/reduce.h>       // sum, mean, std, var, …
+//      #include <numpycpp/numpycpp/manipulation.h> // transpose, take, slice, put
+//      #include <numpycpp/numpycpp/io.h>           // isin, interp, unwrap, …
+//      #include <numpycpp/numpycpp/linalg.h>       // dot, norm, matmul, einsum
+//
+// ════════════════════════════════════════════════════════════════════════════
+#pragma once
+
+#include "init.h"
+#include "elementwise.h"
+#include "reduce.h"
+#include "manipulation.h"
+#include "io.h"
+#include "linalg.h"
diff --git a/numpycpp/numpy_py.h b/numpycpp/numpy_py.h
@@ -1,22 +1,22 @@
 // ════════════════════════════════════════════════════════════════════════════
-//  numpycpp — numpy/numpy_py.h                           [PUBLIC HEADER]
+//  numpycpp — numpycpp/numpy_py.h                         [PUBLIC HEADER]
 //
 //  Single umbrella header — includes all pybind11 wrapper modules.
 //
 //  Usage:
-//      #include "numpy/numpy_py.h"
+//      #include <numpycpp/numpy_py.h>
 //
 //  Prerequisite:
 //      #include <pybind11/pybind11.h>
 //      #include <pybind11/stl.h>
 //
 //  Or include individual wrapper modules as needed:
-//      #include "numpy/init_py.h"         // zeros_like, ones_like, full, …
-//      #include "numpy/elementwise_py.h"  // sqrt, exp, sin, astype, …
-//      #include "numpy/reduce_py.h"       // sum, mean, std, var, cumsum, …
-//      #include "numpy/manipulation_py.h" // transpose, take, slice, put, …
-//      #include "numpy/io_py.h"           // isin, interp, unwrap, asarray, …
-//      #include "numpy/linalg_py.h"       // dot, norm, matmul, einsum
+//      #include <numpycpp/numpycpp/init_py.h>
+//      #include <numpycpp/numpycpp/elementwise_py.h>
+//      #include <numpycpp/numpycpp/reduce_py.h>
+//      #include <numpycpp/numpycpp/manipulation_py.h>
+//      #include <numpycpp/numpycpp/io_py.h>
+//      #include <numpycpp/numpycpp/linalg_py.h>
 // ════════════════════════════════════════════════════════════════════════════
 #pragma once
 
diff --git a/numpycpp/reduce.h b/numpycpp/reduce.h
diff --git a/numpycpp/reduce_py.h b/numpycpp/reduce_py.h
@@ -9,7 +9,7 @@
 
 #include <pybind11/pybind11.h>
 #include <pybind11/numpy.h>
-#include "../numpy/numpy.h"
+#include "numpy.h"
 #include <stdexcept>
 #include <vector>
 
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -84,7 +84,6 @@ pybind11_add_module(numpycpp MODULE module.cpp)
 # Include the numpycpp header-only library (parent dir)
 target_include_directories(numpycpp PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}/..
-    ${CMAKE_CURRENT_SOURCE_DIR}/../pycpp
 )
 if(Eigen3_FOUND)
     target_include_directories(numpycpp PRIVATE ${EIGEN3_INCLUDE_DIR})
diff --git a/tests/module.cpp b/tests/module.cpp
@@ -4,7 +4,7 @@
 
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
-#include "numpy/numpy_py.h"
+#include "numpycpp/numpy_py.h"
 
 namespace py = pybind11;
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include <numpy/numpy.h>`
	`1`	`+#include <numpycpp/numpy.h>`
`2`	`2`	`#include <iostream>`
`3`	`3`	`#include <vector>`
`4`	`4`