[gentoo-commits] proj/sci:master commit in: dev-python/dpctl/files/, dev-python/dpctl/

2023-02-25 Thread Andrew Ammerlaan 
commit: 7efc4ce881506e11f924d65f842063caf3920cf7
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Sun Feb 26 05:18:54 2023 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sun Feb 26 05:18:54 2023 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=7efc4ce8

dev-python/dpctl: add 0.14.1_rc2

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 dev-python/dpctl/dpctl-0.14.1_rc2.ebuild   | 69 ++
 .../dpctl-0.14.1_rc2-dont-fetch-level-zero.patch   | 82 ++
 .../files/dpctl-0.14.1_rc2-dont-fetch-pybind.patch | 21 ++
 3 files changed, 172 insertions(+)

diff --git a/dev-python/dpctl/dpctl-0.14.1_rc2.ebuild 
b/dev-python/dpctl/dpctl-0.14.1_rc2.ebuild
new file mode 100644
index 0..65526b110
--- /dev/null
+++ b/dev-python/dpctl/dpctl-0.14.1_rc2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Data Parallel Control "
+HOMEPAGE="https://github.com/IntelPython/dpctl;
+SRC_URI="https://github.com/IntelPython/dpctl/archive/refs/tags/${PV//_rc/dev}.tar.gz
 -> ${P}.gh.tar.gz"
+S="${WORKDIR}/${PN}-${PV//_rc/dev}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="
+   dev-python/cython[${PYTHON_USEDEP}]
+   dev-python/scikit-build[${PYTHON_USEDEP}]
+   dev-python/pybind11[${PYTHON_USEDEP}]
+   dev-python/versioneer[${PYTHON_USEDEP}]
+   dev-util/cmake
+   dev-vcs/git
+   sys-devel/DPC++
+"
+
+DEPEND="
+   dev-libs/level-zero
+   dev-libs/opencl-icd-loader
+   dev-python/numpy[${PYTHON_USEDEP}]
+   dev-python/wheel[${PYTHON_USEDEP}]
+   sci-libs/oneDAL
+   sys-devel/DPC++:0/6
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-0.14.0-find-opencl.patch"
+   "${FILESDIR}/${PN}-0.14.1_rc2-dont-fetch-level-zero.patch"
+   "${FILESDIR}/${PN}-0.14.1_rc2-dont-fetch-pybind.patch"
+   #"${FILESDIR}/${PN}-0.14.1_rc2-include-tuple.patch"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+   # DPC++ compiler required for full functionality
+   export CC="${ESYSROOT}/usr/lib/llvm/intel/bin/clang"
+   export CXX="${ESYSROOT}/usr/lib/llvm/intel/bin/clang++"
+   export DPCPPROOT="${ESYSROOT}/usr/lib/llvm/intel"
+
+   # Build system reads version from git tag
+   git init -q || die
+   git config --global user.email "la...@gentoo.org" || die
+   git config --global user.name "Larry the Cow" || die
+   git add . || die
+   git commit -qm "init" || die
+   git tag -a "${PV}" -m "${PN} version ${PV}" || die
+
+   distutils-r1_python_prepare_all
+}
+
+python_test() {
+   export 
PYTHONPATH="${BUILD_DIR}/install/usr/lib/${EPYTHON}/site-packages"
+   # We don't use epytest because it overwrites our PYTHONPATH
+   pytest -vv || die
+}

diff --git 
a/dev-python/dpctl/files/dpctl-0.14.1_rc2-dont-fetch-level-zero.patch 
b/dev-python/dpctl/files/dpctl-0.14.1_rc2-dont-fetch-level-zero.patch
new file mode 100644
index 0..a7a4adf8b
--- /dev/null
+++ b/dev-python/dpctl/files/dpctl-0.14.1_rc2-dont-fetch-level-zero.patch
@@ -0,0 +1,82 @@
+diff --git a/libsyclinterface/cmake/modules/GetLevelZeroHeaders.cmake 
b/libsyclinterface/cmake/modules/GetLevelZeroHeaders.cmake
+index fe109fc..55595e9 100644
+--- a/libsyclinterface/cmake/modules/GetLevelZeroHeaders.cmake
 b/libsyclinterface/cmake/modules/GetLevelZeroHeaders.cmake
+@@ -26,76 +26,10 @@
+ 
+ function(get_level_zero_headers)
+ 
+-if(EXISTS level-zero)
+-  # Update the checkout
+-execute_process(
+-COMMAND ${GIT_EXECUTABLE} fetch
+-RESULT_VARIABLE result
+-ERROR_VARIABLE error
+-WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/level-zero
+-OUTPUT_STRIP_TRAILING_WHITESPACE
+-ERROR_STRIP_TRAILING_WHITESPACE
+-)
+-
+-if(NOT result EQUAL 0)
+-message(FATAL_ERROR
+-"Could not update Level Zero sources. Return code: ${result}"
+-)
+-endif()
+-else()
+-# Clone the Level Zero git repo
+-execute_process(
+-COMMAND ${GIT_EXECUTABLE} clone 
https://github.com/oneapi-src/level-zero.git
+-RESULT_VARIABLE result
+-ERROR_VARIABLE error
+-OUTPUT_STRIP_TRAILING_WHITESPACE
+-ERROR_STRIP_TRAILING_WHITESPACE
+-)
+-
+-if(NOT result EQUAL 0)
+-message(FATAL_ERROR
+-"Could not clone Level Zero sources from 
github.com/oneapi-src/level-zero. Return code: ${result}"
+-)
+-endif()
+-endif()
+-
+-# Use git describe to get latest tag name
+-execute_process(
+-COMMAND ${GIT_EXECUTABLE} describe --tags --abbrev=0
+-RESULT_VARIABLE result
+-OUTPUT_VARIABLE latest_tag
+-

[gentoo-commits] proj/sci:master commit in: dev-python/dpctl/files/, dev-python/dpctl/

2022-12-12 Thread Andrew Ammerlaan 
commit: 9e634fb794435f0c083e17567819bfe5161f5c52
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Mon Dec 12 12:49:34 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Mon Dec 12 12:49:34 2022 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=9e634fb7

dev-python/dpctl: add 0.13.0

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 dev-python/dpctl/dpctl-0.13.0.ebuild   | 61 ++
 .../files/dpctl-0.13.0-dont-fetch-pybind.patch | 21 
 2 files changed, 82 insertions(+)

diff --git a/dev-python/dpctl/dpctl-0.13.0.ebuild 
b/dev-python/dpctl/dpctl-0.13.0.ebuild
new file mode 100644
index 0..5e7567775
--- /dev/null
+++ b/dev-python/dpctl/dpctl-0.13.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Data Parallel Control "
+HOMEPAGE="https://github.com/IntelPython/dpctl;
+SRC_URI="https://github.com/IntelPython/dpctl/archive/refs/tags/${PV}.tar.gz 
-> ${P}.gh.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="
+   dev-python/cython[${PYTHON_USEDEP}]
+   dev-python/scikit-build[${PYTHON_USEDEP}]
+   dev-python/pybind11[${PYTHON_USEDEP}]
+   dev-python/versioneer[${PYTHON_USEDEP}]
+   dev-util/cmake
+   dev-vcs/git
+   sys-devel/DPC++
+"
+
+DEPEND="
+   dev-libs/level-zero
+   dev-libs/opencl-icd-loader
+   dev-python/numpy[${PYTHON_USEDEP}]
+   dev-python/wheel[${PYTHON_USEDEP}]
+   sci-libs/oneDAL
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-0.14.0-dont-fetch-level-zero.patch"
+   "${FILESDIR}/${PN}-0.13.0-dont-fetch-pybind.patch"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+   # DPC++ compiler required for full functionality
+   export CC="${ESYSROOT}/usr/lib/llvm/intel/bin/clang"
+   export CXX="${ESYSROOT}/usr/lib/llvm/intel/bin/clang++"
+   export DPCPPROOT="${ESYSROOT}/usr/lib/llvm/intel"
+
+   # For some reason this is required to build successfully
+   mkdir -p 
_skbuild/linux-x86_64-3.8/setuptools/lib.linux-x86_64-cpython-38/dpctl || die
+   cp dpctl/_version.py 
_skbuild/linux-x86_64-3.8/setuptools/lib.linux-x86_64-cpython-38/dpctl || die
+   mkdir -p 
_skbuild/linux-x86_64-3.9/setuptools/lib.linux-x86_64-cpython-39/dpctl || die
+   cp dpctl/_version.py 
_skbuild/linux-x86_64-3.9/setuptools/lib.linux-x86_64-cpython-39/dpctl || die
+   mkdir -p 
_skbuild/linux-x86_64-3.10/setuptools/lib.linux-x86_64-cpython-310/dpctl || die
+   cp dpctl/_version.py 
_skbuild/linux-x86_64-3.10/setuptools/lib.linux-x86_64-cpython-310/dpctl || die
+   mkdir -p 
_skbuild/linux-x86_64-3.11/setuptools/lib.linux-x86_64-cpython-311/dpctl || die
+   cp dpctl/_version.py 
_skbuild/linux-x86_64-3.11/setuptools/lib.linux-x86_64-cpython-311/dpctl || die
+
+   distutils-r1_python_prepare_all
+}

diff --git a/dev-python/dpctl/files/dpctl-0.13.0-dont-fetch-pybind.patch 
b/dev-python/dpctl/files/dpctl-0.13.0-dont-fetch-pybind.patch
new file mode 100644
index 0..b7dab5c75
--- /dev/null
+++ b/dev-python/dpctl/files/dpctl-0.13.0-dont-fetch-pybind.patch
@@ -0,0 +1,21 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 23ae1dd..e144e90 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -26,15 +26,7 @@ install(FILES ${_dpctl_capi_headers}
+ # Define CMAKE_INSTALL_xxx: LIBDIR, INCLUDEDIR
+ include(GNUInstallDirs)
+ 
+-# Fetch pybind11
+-include(FetchContent)
+-
+-FetchContent_Declare(
+-pybind11
+-URL https://github.com/pybind/pybind11/archive/refs/tags/v2.9.2.tar.gz
+-URL_HASH 
SHA256=6bd528c4dbe2276635dc787b6b1f2e5316cf6b49ee3e150264e455a0d68d19c1
+-)
+-FetchContent_MakeAvailable(pybind11)
++include(/usr/share/cmake/pybind11/pybind11Config.cmake)
+ 
+ add_subdirectory(dpctl)
+

[gentoo-commits] proj/sci:master commit in: dev-python/dpctl/files/, dev-python/dpctl/

2022-12-11 Thread Andrew Ammerlaan 
commit: b485ae43a8567e1879c5611452cdcc10c89dc277
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Sun Dec 11 22:56:44 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sun Dec 11 22:56:44 2022 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=b485ae43

dev-python/dpctl: new package, add 0.14.0

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 dev-python/dpctl/dpctl-0.14.0.ebuild   | 60 
 .../files/dpctl-0.14.0-dont-fetch-level-zero.patch | 82 ++
 .../files/dpctl-0.14.0-dont-fetch-pybind.patch | 21 ++
 .../dpctl/files/dpctl-0.14.0-find-opencl.patch | 13 
 .../dpctl/files/dpctl-0.14.0-include-tuple.patch   | 47 +
 dev-python/dpctl/metadata.xml  | 12 
 6 files changed, 235 insertions(+)

diff --git a/dev-python/dpctl/dpctl-0.14.0.ebuild 
b/dev-python/dpctl/dpctl-0.14.0.ebuild
new file mode 100644
index 0..ffb22d0cf
--- /dev/null
+++ b/dev-python/dpctl/dpctl-0.14.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Data Parallel Control "
+HOMEPAGE="https://github.com/IntelPython/dpctl;
+SRC_URI="https://github.com/IntelPython/dpctl/archive/refs/tags/${PV}.tar.gz 
-> ${P}.gh.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="
+   dev-python/cython[${PYTHON_USEDEP}]
+   dev-python/scikit-build[${PYTHON_USEDEP}]
+   dev-python/pybind11[${PYTHON_USEDEP}]
+   dev-util/cmake
+   dev-vcs/git
+   sys-devel/DPC++
+"
+
+DEPEND="
+   dev-libs/level-zero
+   dev-libs/opencl-icd-loader
+   dev-python/numpy[${PYTHON_USEDEP}]
+   dev-python/wheel[${PYTHON_USEDEP}]
+   sci-libs/oneDAL
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+   "${FILESDIR}/${P}-find-opencl.patch"
+   "${FILESDIR}/${P}-dont-fetch-level-zero.patch"
+   "${FILESDIR}/${P}-dont-fetch-pybind.patch"
+   "${FILESDIR}/${P}-include-tuple.patch"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+   # DPC++ compiler required for full functionality
+   export CC="${ESYSROOT}/usr/lib/llvm/intel/bin/clang"
+   export CXX="${ESYSROOT}/usr/lib/llvm/intel/bin/clang++"
+   export DPCPPROOT="${ESYSROOT}/usr/lib/llvm/intel"
+
+   # Build system reads version from git tag
+   git init -q || die
+   git config --global user.email "la...@gentoo.org" || die
+   git config --global user.name "Larry the Cow" || die
+   git add . || die
+   git commit -qm "init" || die
+   git tag -a "${PV}" -m "${PN} version ${PV}" || die
+
+   distutils-r1_python_prepare_all
+}

diff --git a/dev-python/dpctl/files/dpctl-0.14.0-dont-fetch-level-zero.patch 
b/dev-python/dpctl/files/dpctl-0.14.0-dont-fetch-level-zero.patch
new file mode 100644
index 0..ac0301886
--- /dev/null
+++ b/dev-python/dpctl/files/dpctl-0.14.0-dont-fetch-level-zero.patch
@@ -0,0 +1,82 @@
+diff --git a/libsyclinterface/cmake/modules/GetLevelZeroHeaders.cmake 
b/libsyclinterface/cmake/modules/GetLevelZeroHeaders.cmake
+index 2929c33..731f054 100644
+--- a/libsyclinterface/cmake/modules/GetLevelZeroHeaders.cmake
 b/libsyclinterface/cmake/modules/GetLevelZeroHeaders.cmake
+@@ -26,76 +26,10 @@
+ 
+ function(get_level_zero_headers)
+ 
+-if(EXISTS level-zero)
+-  # Update the checkout
+-execute_process(
+-COMMAND ${GIT_EXECUTABLE} fetch
+-RESULT_VARIABLE result
+-ERROR_VARIABLE error
+-WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/level-zero
+-OUTPUT_STRIP_TRAILING_WHITESPACE
+-ERROR_STRIP_TRAILING_WHITESPACE
+-)
+-
+-if(NOT result EQUAL 0)
+-message(FATAL_ERROR
+-"Could not update Level Zero sources."
+-)
+-endif()
+-else()
+-# Clone the Level Zero git repo
+-execute_process(
+-COMMAND ${GIT_EXECUTABLE} clone 
https://github.com/oneapi-src/level-zero.git
+-RESULT_VARIABLE result
+-ERROR_VARIABLE error
+-OUTPUT_STRIP_TRAILING_WHITESPACE
+-ERROR_STRIP_TRAILING_WHITESPACE
+-)
+-
+-if(NOT result EQUAL 0)
+-message(FATAL_ERROR
+-"Could not clone Level Zero sources from 
github.com/oneapi-src/level-zero."
+-)
+-endif()
+-endif()
+-
+-# Use git describe to get latest tag name
+-execute_process(
+-COMMAND ${GIT_EXECUTABLE} describe --tags --abbrev=0
+-RESULT_VARIABLE result
+-OUTPUT_VARIABLE latest_tag
+-ERROR_VARIABLE error
+-WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/level-zero
+-OUTPUT_STRIP_TRAILING_WHITESPACE
+-ERROR_STRIP_TRAILING_WHITESPACE
+-)
+-
+-if(NOT result EQUAL 0)
+-