commit: 663b688fc77db01783400a7e4c2e3c01d44aa00e
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 12 14:40:47 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon Dec 12 14:40:47 2022 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=663b688f
dev-python/dpnp: fix installation of backend library
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
dev-python/dpnp/dpnp-0.10.0.ebuild | 9 ++++++++-
.../dpnp/files/dpnp-0.10.0-fix-compile.patch | 23 +++++++++++++++++++++-
2 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/dev-python/dpnp/dpnp-0.10.0.ebuild
b/dev-python/dpnp/dpnp-0.10.0.ebuild
index 903a2f806..da7abcc88 100644
--- a/dev-python/dpnp/dpnp-0.10.0.ebuild
+++ b/dev-python/dpnp/dpnp-0.10.0.ebuild
@@ -4,7 +4,8 @@
EAPI=8
PYTHON_COMPAT=( python3_{8..11} )
-DISTUTILS_USE_PEP517=setuptools
+# Breaks the installation of the backend library
+#DISTUTILS_USE_PEP517=setuptools
inherit distutils-r1
DESCRIPTION="Data Parallel Extension for NumPy"
@@ -26,6 +27,7 @@ RDEPEND="
dev-python/dpctl[${PYTHON_USEDEP}]
dev-python/numpy[${PYTHON_USEDEP}]
sci-libs/mkl
+ sys-devel/DPC++:=
"
DEPEND="${RDEPEND}
sys-devel/oneDPL
@@ -48,3 +50,8 @@ python_prepare_all() {
distutils-r1_python_prepare_all
}
+
+python_compile() {
+ export BUILD_DIR_LIBS="${BUILD_DIR}/lib/dpnp"
+ distutils-r1_python_compile
+}
diff --git a/dev-python/dpnp/files/dpnp-0.10.0-fix-compile.patch
b/dev-python/dpnp/files/dpnp-0.10.0-fix-compile.patch
index 49559afab..deaa95d0b 100644
--- a/dev-python/dpnp/files/dpnp-0.10.0-fix-compile.patch
+++ b/dev-python/dpnp/files/dpnp-0.10.0-fix-compile.patch
@@ -20,7 +20,7 @@ index c089b1d..3bb0739 100755
./example3
diff --git a/dpnp/backend/CMakeLists.txt b/dpnp/backend/CMakeLists.txt
-index 81f073c..24c6b65 100644
+index 81f073c..bcc4ecc 100644
--- a/dpnp/backend/CMakeLists.txt
+++ b/dpnp/backend/CMakeLists.txt
@@ -88,24 +88,6 @@ if (CMAKE_VERSION VERSION_EQUAL 3.19.1)
@@ -48,6 +48,14 @@ index 81f073c..24c6b65 100644
# set language version
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
+@@ -280,6 +262,7 @@ endif()
+ # set_target_properties(dpnp_backend_c PROPERTIES VERSION ${DPNP_VERSION}
SOVERSION ${DPNP_API_VERSION})
+
+ install(TARGETS dpnp_backend_c
++ DESTINATION ${DPNP_INSTALL_PREFIX}
+ PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ
GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+ )
+
diff --git a/utils/command_build_clib.py b/utils/command_build_clib.py
index dc9f322..35432fa 100644
--- a/utils/command_build_clib.py
@@ -74,3 +82,16 @@ index dc9f322..35432fa 100644
_project_cmplr_flag_sycl = []
_project_cmplr_flag_stdcpp_static = []
_project_cmplr_flag_compatibility = []
+diff --git a/utils/command_build_cmake_clib.py
b/utils/command_build_cmake_clib.py
+index 0ef0e24..84f2469 100644
+--- a/utils/command_build_cmake_clib.py
++++ b/utils/command_build_cmake_clib.py
+@@ -112,7 +112,7 @@ class custom_build_cmake_clib(build_clib.build_clib):
+ "-S" + backend_directory,
+ "-B" + abs_build_temp_path,
+ "-DCMAKE_BUILD_TYPE=" + config,
+- "-DDPNP_INSTALL_PREFIX=" + install_directory.replace(os.sep,
"/"), # adjust to cmake requirenments
++ "-DDPNP_INSTALL_PREFIX=" + os.environ.get('BUILD_DIR_LIBS'), #
adjust to cmake requirenments
+ "-DDPNP_INSTALL_STRUCTURED=OFF",
+ # "-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=" + install_directory,
+ "-DDPNP_SYCL_QUEUE_MGR_ENABLE:BOOL=" + _dpctrl_exists,
