* [gentoo-commits] repo/gentoo:master commit in: dev-libs/pocl/, dev-libs/pocl/files/
@ 2021-09-22 22:31 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2021-09-22 22:31 UTC (permalink / raw
To: gentoo-commits
commit: 4eae8cc9da09814d2b5a5d5c3f773bff6a48d75f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 22 22:26:31 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Sep 22 22:31:40 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4eae8cc9
dev-libs/pocl: initial import
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-libs/pocl/Manifest | 1 +
.../pocl/files/vendor_opencl_libs_location.patch | 20 ++++
dev-libs/pocl/metadata.xml | 21 +++++
dev-libs/pocl/pocl-1.7.ebuild | 103 +++++++++++++++++++++
4 files changed, 145 insertions(+)
diff --git a/dev-libs/pocl/Manifest b/dev-libs/pocl/Manifest
new file mode 100644
index 00000000000..4ac613d41bb
--- /dev/null
+++ b/dev-libs/pocl/Manifest
@@ -0,0 +1 @@
+DIST pocl-1.7.tar.gz 1577676 BLAKE2B 50d4f50236b1c81f319b5559ca2b1df529209f07899acf51c487820d97cc6766c5130a55afca910517c7db63d8041ac8306062880c3a821cbc1bf9108bf13d65 SHA512 23bb82b25a222186c001b2ed413f26253e1e0e16518e98c95173f51491e15d107e6ab1b334ffd490b41199743267d9ad64882a22fea327e17ec9604f9847fc38
diff --git a/dev-libs/pocl/files/vendor_opencl_libs_location.patch b/dev-libs/pocl/files/vendor_opencl_libs_location.patch
new file mode 100644
index 00000000000..548589ca41b
--- /dev/null
+++ b/dev-libs/pocl/files/vendor_opencl_libs_location.patch
@@ -0,0 +1,20 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -125,7 +125,7 @@
+ endif()
+
+ # for libpocl.so
+-set(POCL_INSTALL_PUBLIC_LIBDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}" CACHE PATH "POCL public libdir")
++set(POCL_INSTALL_PUBLIC_LIBDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/OpenCL/vendors/pocl" CACHE PATH "POCL public libdir")
+
+ # for llvmopencl.so
+ set(POCL_INSTALL_PRIVATE_LIBDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pocl" CACHE PATH "POCL private libdir")
+@@ -134,7 +134,7 @@
+ if(UNIX AND NOT CMAKE_CROSSCOMPILING AND CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+ set(POCL_INSTALL_ICD_VENDORDIR "/etc/OpenCL/vendors" CACHE PATH "POCL ICD file destination")
+ else()
+- set(POCL_INSTALL_ICD_VENDORDIR "${CMAKE_INSTALL_PREFIX}/etc/OpenCL/vendors" CACHE PATH "POCL ICD file destination")
++ set(POCL_INSTALL_ICD_VENDORDIR "${SYSCONFDIR}/etc/OpenCL/vendors" CACHE PATH "POCL ICD file destination")
+ endif()
+
+ # for kernel-<target>.bc
diff --git a/dev-libs/pocl/metadata.xml b/dev-libs/pocl/metadata.xml
new file mode 100644
index 00000000000..1e1a7087abb
--- /dev/null
+++ b/dev-libs/pocl/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<pkgmetadata>
+ <maintainer type="person">
+ <email>sam@gentoo.org</email>
+ <name>Sam James</name>
+ </maintainer>
+ <use>
+ <flag name="accel">Enable the generic hardware accelerator device driver</flag>
+ <flag name="cl20">Enable reporting OpenCL 2.0 for the CPU device</flag>
+ <flag name="conformance">Ensures that certain build options which would result in non-conformant pocl build stay disabled. Note that this does not quarantee a fully conformant build of pocl.</flag>
+ <flag name="cuda">Enable the CUDA backend for NVIDIA GPUs</flag>
+ <flag name="float-conversion">When enabled, OpenCL printf() call's f/e/g formatters are handled by pocl. When disabled, these are handled by system C library.</flag>
+ <flag name="hardening">Enable hardening against various attacks. May worsen performance</flag>
+ <!--<flag name="hsa">Enable the HSA base profile runtime device driver</flag>-->
+ <flag name="hwloc">Enable hwloc support</flag>
+ <flag name="memmanager">Enables custom memory manager. Except for special circumstances, this should be disabled</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">pocl/pocl</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-libs/pocl/pocl-1.7.ebuild b/dev-libs/pocl/pocl-1.7.ebuild
new file mode 100644
index 00000000000..74100b13bb3
--- /dev/null
+++ b/dev-libs/pocl/pocl-1.7.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DOCS_AUTODOC=0
+DOCS_BUILDER="sphinx"
+DOCS_DIR="doc/sphinx/source"
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit cmake llvm python-any-r1 docs
+
+LLVM_MAX_SLOT=12
+
+DESCRIPTION="Portable Computing Language (an implementation of OpenCL)"
+HOMEPAGE="
+ http://portablecl.org
+ https://github.com/pocl/pocl
+"
+SRC_URI="https://github.com/pocl/pocl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="accel cl20 +conformance cuda debug examples float-conversion hardening +hwloc memmanager test" #hsa tce
+
+RESTRICT="!test? ( test ) mirror"
+
+#TODO: add dependencies for cuda
+RDEPEND="
+ dev-libs/libltdl
+ sys-devel/llvm:${LLVM_MAX_SLOT}
+ virtual/opencl
+
+ !cuda? ( sys-devel/clang:${LLVM_MAX_SLOT} )
+ cuda? ( sys-devel/clang:${LLVM_MAX_SLOT}[llvm_targets_NVPTX] )
+ debug? ( dev-util/lttng-ust )
+ hwloc? ( sys-apps/hwloc[cuda?] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+ doc? (
+ $(python_gen_any_dep '<dev-python/markupsafe-2.0[${PYTHON_USEDEP}]')
+ )"
+
+PATCHES=( "${FILESDIR}/vendor_opencl_libs_location.patch" )
+
+python_check_deps() {
+ has_version -b "<dev-python/markupsafe-2.0[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ use doc && python-any-r1_pkg_setup
+}
+
+src_configure() {
+ llvm_pkg_setup
+ local mycmakeargs=(
+ -DBUILD_SHARED_LIBS=ON
+ -DENABLE_HSA=OFF
+ -DENABLE_ICD=ON
+ -DENABLE_POCL_BUILDING=ON
+ -DKERNELLIB_HOST_CPU_VARIANTS=native
+ -DPOCL_ICD_ABSOLUTE_PATH=ON
+ -DSTATIC_LLVM=OFF
+
+ -DENABLE_ACCEL_DEVICE=$(usex accel)
+ -DENABLE_CONFORMANCE=$(usex conformance)
+ -DENABLE_CUDA=$(usex cuda)
+ -DENABLE_HOST_CPU_DEVICE_CL20=$(usex cl20)
+ -DENABLE_HWLOC=$(usex hwloc)
+ -DENABLE_POCL_FLOAT_CONVERSION=$(usex float-conversion)
+ -DHARDENING_ENABLE=$(usex hardening)
+ -DPOCL_DEBUG_MESSAGES=$(usex debug)
+ -DUSE_POCL_MEMMANAGER=$(usex memmanager)
+ -DWITH_LLVM_CONFIG=$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config
+ )
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+ docs_compile
+}
+
+src_test() {
+ export POCL_BUILDING=1
+ export CTEST_OUTPUT_ON_FAILURE=1
+ cmake_src_test
+}
+
+src_install() {
+ cmake_src_install
+ dodoc CREDITS README CHANGES
+ if use doc; then
+ dodoc -r _build/html
+ docompress -x "/usr/share/doc/${P}/html"
+ fi
+ if use examples; then
+ dodoc -r examples
+ docompress -x "/usr/share/doc/${P}/examples"
+ fi
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/pocl/, dev-libs/pocl/files/
@ 2023-04-18 6:51 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2023-04-18 6:51 UTC (permalink / raw
To: gentoo-commits
commit: e2cbd05e2822030b3d2d8d23bbce19c8f51f17cd
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 18 06:47:23 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 18 06:50:49 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2cbd05e
dev-libs/pocl: fix example build
Closes: https://bugs.gentoo.org/903968
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-libs/pocl/files/pocl-3.1-c++11.patch | 23 +++++++++++++++++++++++
dev-libs/pocl/pocl-3.1.ebuild | 1 +
2 files changed, 24 insertions(+)
diff --git a/dev-libs/pocl/files/pocl-3.1-c++11.patch b/dev-libs/pocl/files/pocl-3.1-c++11.patch
new file mode 100644
index 000000000000..e676979f2e95
--- /dev/null
+++ b/dev-libs/pocl/files/pocl-3.1-c++11.patch
@@ -0,0 +1,23 @@
+https://bugs.gentoo.org/903968
+https://github.com/pocl/pocl/issues/1200
+https://github.com/pocl/pocl/commit/b5a097e5e55922561f738eedbde050b0fec2e480
+
+From b5a097e5e55922561f738eedbde050b0fec2e480 Mon Sep 17 00:00:00 2001
+From: Topi Leppanen <topi.leppanen@tuni.fi>
+Date: Thu, 13 Apr 2023 11:14:23 +0300
+Subject: [PATCH] Don't use make_unique in countred example
+
+This is because of C++11 compatibility reasons.
+Fixes #1200.
+--- a/examples/accel/OpenCLcontext.cpp
++++ b/examples/accel/OpenCLcontext.cpp
+@@ -189,7 +189,8 @@ bool OpenCL_Manager::processCameraFrame(unsigned char* input, unsigned long *out
+ return isValid;
+ }
+
+-OpenCL_Manager::OpenCL_Manager() : Context{std::make_unique<OpenCL_Context>()} {}
++OpenCL_Manager::OpenCL_Manager()
++ : Context{std::unique_ptr<OpenCL_Context>(new OpenCL_Context())} {}
+ OpenCL_Manager::~OpenCL_Manager() {}
+
+
diff --git a/dev-libs/pocl/pocl-3.1.ebuild b/dev-libs/pocl/pocl-3.1.ebuild
index 473aa1f2fa62..ff61446e2a20 100644
--- a/dev-libs/pocl/pocl-3.1.ebuild
+++ b/dev-libs/pocl/pocl-3.1.ebuild
@@ -52,6 +52,7 @@ llvm_check_deps() {
PATCHES=(
"${FILESDIR}"/${P}-nodebug.patch
+ "${FILESDIR}"/${P}-c++11.patch
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/pocl/, dev-libs/pocl/files/
@ 2023-11-25 8:54 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2023-11-25 8:54 UTC (permalink / raw
To: gentoo-commits
commit: 85aa0c68d749c9352a7291f6a2152e89e43db5d1
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 25 08:53:14 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 25 08:53:14 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85aa0c68
dev-libs/pocl: drop 3.1
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-libs/pocl/Manifest | 1 -
dev-libs/pocl/files/pocl-3.1-c++11.patch | 23 ------
dev-libs/pocl/files/pocl-3.1-nodebug.patch | 29 -------
dev-libs/pocl/pocl-3.1.ebuild | 126 -----------------------------
4 files changed, 179 deletions(-)
diff --git a/dev-libs/pocl/Manifest b/dev-libs/pocl/Manifest
index 71518dab3615..b2eb19f5fd11 100644
--- a/dev-libs/pocl/Manifest
+++ b/dev-libs/pocl/Manifest
@@ -1,2 +1 @@
-DIST pocl-3.1.tar.gz 1928607 BLAKE2B 7044a96e361426408fabd973987a0d6956693e3c9095769ee94d7dac47a8841d7489933e94acd22451a1c8a2ca83cb8e6948aebe899b23a8a6080ef1b7b37e9c SHA512 40d17e81d715f6897aa1d97fd02834d45227d9d0bd4c70e76d727f9ad4df675c25b7158a862e20e63810182fdad82a3cb1e454668c3a6422a977e59c8325fa0c
DIST pocl-4.0.tar.gz 2140919 BLAKE2B 1e9dd4de4824dd4a9e2b0d053d1786062c135d3bf7ca99dc884657b89c651fca6c0f3dedb568439802a58b0bfabc10939ca344b0110ae5fdb31be06f596d2a48 SHA512 3835a9e8fc8562d50a91a11b807cf87a096891f5c27675127b66412eacff2e541b6143b49b4155f43a09f4e53faa062ec20f3b20badeca206ece9f45ad50f26a
diff --git a/dev-libs/pocl/files/pocl-3.1-c++11.patch b/dev-libs/pocl/files/pocl-3.1-c++11.patch
deleted file mode 100644
index e676979f2e95..000000000000
--- a/dev-libs/pocl/files/pocl-3.1-c++11.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://bugs.gentoo.org/903968
-https://github.com/pocl/pocl/issues/1200
-https://github.com/pocl/pocl/commit/b5a097e5e55922561f738eedbde050b0fec2e480
-
-From b5a097e5e55922561f738eedbde050b0fec2e480 Mon Sep 17 00:00:00 2001
-From: Topi Leppanen <topi.leppanen@tuni.fi>
-Date: Thu, 13 Apr 2023 11:14:23 +0300
-Subject: [PATCH] Don't use make_unique in countred example
-
-This is because of C++11 compatibility reasons.
-Fixes #1200.
---- a/examples/accel/OpenCLcontext.cpp
-+++ b/examples/accel/OpenCLcontext.cpp
-@@ -189,7 +189,8 @@ bool OpenCL_Manager::processCameraFrame(unsigned char* input, unsigned long *out
- return isValid;
- }
-
--OpenCL_Manager::OpenCL_Manager() : Context{std::make_unique<OpenCL_Context>()} {}
-+OpenCL_Manager::OpenCL_Manager()
-+ : Context{std::unique_ptr<OpenCL_Context>(new OpenCL_Context())} {}
- OpenCL_Manager::~OpenCL_Manager() {}
-
-
diff --git a/dev-libs/pocl/files/pocl-3.1-nodebug.patch b/dev-libs/pocl/files/pocl-3.1-nodebug.patch
deleted file mode 100644
index ea1085dc4a49..000000000000
--- a/dev-libs/pocl/files/pocl-3.1-nodebug.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://github.com/pocl/pocl/commit/a13cb332d6678d4556d7319b284b77c371c4b91e
-
-commit a13cb332d6678d4556d7319b284b77c371c4b91e
-Author: Martin Kletzander <nert.pinx@gmail.com>
-Date: Tue Jan 17 09:04:41 2023 +0100
-
- Add stub macro POCL_MSG_PRINT_ALMAIF_MMAP without POCL_DEBUG_MESSAGES
-
- Without this the build fails with the following error when built without
- POCL_DEBUG_MESSAGES:
-
- ../lib/CL/devices/almaif/MMAPRegion.cc: In constructor ‘MMAPRegion::MMAPRegion(size_t, size_t, int)’:
- ../lib/CL/devices/almaif/MMAPRegion.cc:43:3: error: ‘POCL_MSG_PRINT_ALMAIF_MMAP’ was not declared in this scope; did you mean ‘POCL_MSG_PRINT_ALMAIF2’?
- 43 | POCL_MSG_PRINT_ALMAIF_MMAP(
- | ^~~~~~~~~~~~~~~~~~~~~~~~~~
- | POCL_MSG_PRINT_ALMAIF2
-
- and about 10 more.
-
---- a/lib/CL/pocl_debug.h
-+++ b/lib/CL/pocl_debug.h
-@@ -284,6 +284,7 @@ POCL_EXPORT
-
- #define POCL_MSG_PRINT_ALMAIF2(...) do {} while (0)
- #define POCL_MSG_PRINT_ALMAIF(...) do {} while (0)
-+ #define POCL_MSG_PRINT_ALMAIF_MMAP(...) do {} while (0)
- #define POCL_MSG_PRINT_PROXY2(...) do {} while (0)
- #define POCL_MSG_PRINT_PROXY(...) do {} while (0)
- #define POCL_MSG_PRINT_VULKAN2(...) do {} while (0)
diff --git a/dev-libs/pocl/pocl-3.1.ebuild b/dev-libs/pocl/pocl-3.1.ebuild
deleted file mode 100644
index ff61446e2a20..000000000000
--- a/dev-libs/pocl/pocl-3.1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_MAX_SLOT=15
-
-inherit cmake llvm
-
-DESCRIPTION="Portable Computing Language (an implementation of OpenCL)"
-HOMEPAGE="http://portablecl.org https://github.com/pocl/pocl"
-SRC_URI="https://github.com/pocl/pocl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc64"
-# TODO: hsa tce
-IUSE="accel +conformance cuda debug examples float-conversion hardening +hwloc memmanager lto test"
-# Tests not yet passing, fragile in Portage environment(?)
-RESTRICT="!test? ( test ) test"
-
-# TODO: add dependencies for cuda
-# Note: No := on LLVM because it pulls in Clang
-# see llvm.eclass for why
-CLANG_DEPS="
- !cuda? ( <sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):= )
- cuda? ( <sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=[llvm_targets_NVPTX] )
-"
-RDEPEND="
- dev-libs/libltdl
- <sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):*
- virtual/opencl
-
- ${CLANG_DEPS}
- debug? ( dev-util/lttng-ust:= )
- hwloc? ( sys-apps/hwloc:=[cuda?] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- ${CLANG_DEPS}
- virtual/pkgconfig
-"
-
-llvm_check_deps() {
- local usedep=$(usex cuda "[llvm_targets_NVPTX]" '')
-
- # Clang is used at both build time (executed) and runtime
- has_version -r "sys-devel/llvm:${LLVM_SLOT}${usedep}" && \
- has_version -r "sys-devel/clang:${LLVM_SLOT}${usedep}" && \
- has_version -b "sys-devel/clang:${LLVM_SLOT}${usedep}"
-}
-
-PATCHES=(
- "${FILESDIR}"/${P}-nodebug.patch
- "${FILESDIR}"/${P}-c++11.patch
-)
-
-pkg_setup() {
- llvm_pkg_setup
-}
-
-src_configure() {
- local host_cpu_variants="generic"
-
- if use amd64 ; then
- # Use pocl's curated list of CPU variants which should contain a good match for any given amd64 CPU
- host_cpu_variants="distro"
- elif use ppc64 ; then
- # A selection of architectures in which new Altivec / VSX features were added
- # This attempts to recreate the amd64 "distro" option for ppc64
- # See discussion in bug #831859
- host_cpu_variants="pwr10;pwr9;pwr8;pwr7;pwr6;g5;a2;generic"
- fi
-
- local mycmakeargs=(
- -DENABLE_HSA=OFF
-
- -DENABLE_ICD=ON
- -DPOCL_ICD_ABSOLUTE_PATH=ON
- -DPOCL_INSTALL_PUBLIC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/OpenCL/vendors/pocl"
-
- -DENABLE_IPO=$(usex lto)
-
- -DENABLE_POCL_BUILDING=ON
- -DKERNELLIB_HOST_CPU_VARIANTS="${host_cpu_variants}"
-
- -DSTATIC_LLVM=OFF
- -DWITH_LLVM_CONFIG=$(get_llvm_prefix -d "${LLVM_MAX_SLOT}")/bin/llvm-config
-
- -DENABLE_ALMAIF_DEVICE=$(usex accel)
- -DENABLE_CONFORMANCE=$(usex conformance)
- -DENABLE_CUDA=$(usex cuda)
- -DENABLE_HWLOC=$(usex hwloc)
- -DENABLE_POCL_FLOAT_CONVERSION=$(usex float-conversion)
- -DHARDENING_ENABLE=$(usex hardening)
- -DPOCL_DEBUG_MESSAGES=$(usex debug)
- -DUSE_POCL_MEMMANAGER=$(usex memmanager)
- -DENABLE_TESTS=$(usex test)
- )
-
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
-}
-
-src_test() {
- export POCL_BUILDING=1
- export POCL_DEVICES=basic
- export CTEST_OUTPUT_ON_FAILURE=1
- export TEST_VERBOSE=1
-
- # Referenced https://github.com/pocl/pocl/blob/master/.drone.yml
- # But couldn't seem to get tests working yet
- cmake_src_test
-}
-
-src_install() {
- cmake_src_install
-
- if use examples; then
- dodoc -r examples
- docompress -x /usr/share/doc/${P}/examples
- fi
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/pocl/, dev-libs/pocl/files/
@ 2024-07-08 11:39 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2024-07-08 11:39 UTC (permalink / raw
To: gentoo-commits
commit: 071eeea797884907023ef46b09653c0a7a0eca68
Author: Matthew White <mehw.is.me <AT> inventati <DOT> org>
AuthorDate: Sun Mar 31 10:14:43 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 8 11:38:56 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=071eeea7
dev-libs/pocl: bump version to 5.0
Closes: https://bugs.gentoo.org/922912
Package-Manager: portage-3.0.63
Signed-off-by: Matthew White <mehw.is.me <AT> inventati.org>
Closes: https://github.com/gentoo/gentoo/pull/36014
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-libs/pocl/Manifest | 1 +
.../files/pocl-5.0-missing-definitions-fix.patch | 41 ++++++++
dev-libs/pocl/pocl-5.0.ebuild | 115 +++++++++++++++++++++
3 files changed, 157 insertions(+)
diff --git a/dev-libs/pocl/Manifest b/dev-libs/pocl/Manifest
index b2eb19f5fd11..336dcf9d0f22 100644
--- a/dev-libs/pocl/Manifest
+++ b/dev-libs/pocl/Manifest
@@ -1 +1,2 @@
DIST pocl-4.0.tar.gz 2140919 BLAKE2B 1e9dd4de4824dd4a9e2b0d053d1786062c135d3bf7ca99dc884657b89c651fca6c0f3dedb568439802a58b0bfabc10939ca344b0110ae5fdb31be06f596d2a48 SHA512 3835a9e8fc8562d50a91a11b807cf87a096891f5c27675127b66412eacff2e541b6143b49b4155f43a09f4e53faa062ec20f3b20badeca206ece9f45ad50f26a
+DIST pocl-5.0.tar.gz 2361502 BLAKE2B eca07953ff56e7e4ca10f71db12819547bc8ff28da26e569c3544edd802f9ded0a8bd0d9cb260069cfe3788f9bc6c84d6ae96c1148c4e92fe6268a95a60ee5b6 SHA512 c2d6c80cbcba7af1c31dfa794c2aa7be6d1ce2cc9900fbf6e0a1536747440602cdc0f1a84f81f85737818a7ea60b490558ef328b3b156e52c63db3fe4ce490b0
diff --git a/dev-libs/pocl/files/pocl-5.0-missing-definitions-fix.patch b/dev-libs/pocl/files/pocl-5.0-missing-definitions-fix.patch
new file mode 100644
index 000000000000..251bdad65bd6
--- /dev/null
+++ b/dev-libs/pocl/files/pocl-5.0-missing-definitions-fix.patch
@@ -0,0 +1,41 @@
+Fixes missing definitions.
+
+FAILED: lib/CL/devices/almaif/CMakeFiles/pocl-devices-almaif.dir/MMAPDevice.cc.o
+/usr/bin/x86_64-pc-linux-gnu-g++ -DCL_HPP_TARGET_OPENCL_VERSION=300 -DCL_TARGET_OPENCL_VERSION=300 -DCL_USE_DEPRECATED_OPENCL_1_0_APIS -DCL_USE_DEPRECATED_OPENCL_1_1_APIS -DCL_USE_DEPRECATED_OPENCL_1_2_APIS -DCL_USE_DEPRECATED_OPENCL_2_0_APIS -DCL_USE_DEPRECATED_OPENCL_2_1_APIS -DCL_USE_DEPRECATED_OPENCL_2_2_APIS -Dpocl_devices_almaif_EXPORTS -I/var/tmp/portage/dev-libs/pocl-5.0/work/pocl-5.0_build -I/var/tmp/portage/dev-libs/pocl-5.0/work/pocl-5.0/include -I/var/tmp/portage/dev-libs/pocl-5.0/work/pocl-5.0/include/hpp -I/var/tmp/portage/dev-libs/pocl-5.0/work/pocl-5.0/lib/CL/devices -I/var/tmp/portage/dev-libs/pocl-5.0/work/pocl-5.0/lib/CL/. -O2 -pipe -march=x86-64 -mtune=generic -std=c++11 -fPIC -Wno-ignored-attributes -fvisibility=hidden -fvisibility-inlines-hidden -MD -MT lib/CL/devices/almaif/CMakeFiles/pocl-devices-almaif.dir/MMAPDevice.cc.o -MF lib/CL/devices/almaif/CMakeFiles/pocl-devices-almaif.dir/MMAPDevice.cc.o.d -o lib/CL/devices/almaif/CMakeFiles/pocl-devices-almaif.di
r/MMAPDevice.cc.o -c /var/tmp/portage/dev-libs/pocl-5.0/work/pocl-5.0/lib/CL/devices/almaif/MMAPDevice.cc
+In file included from /var/tmp/portage/dev-libs/pocl-5.0/work/pocl-5.0/lib/CL/devices/almaif/MMAPDevice.hh:28,
+ from /var/tmp/portage/dev-libs/pocl-5.0/work/pocl-5.0/lib/CL/devices/almaif/MMAPDevice.cc:24:
+/var/tmp/portage/dev-libs/pocl-5.0/work/pocl-5.0/lib/CL/devices/almaif/AlmaIFDevice.hh:45:36: error: ‘cl_kernel’ has not been declared
+ 45 | cl_kernel Kernel, _cl_command_node *Command);
+ | ^~~~~~~~~
+/var/tmp/portage/dev-libs/pocl-5.0/work/pocl-5.0/lib/CL/devices/almaif/AlmaIFDevice.hh:45:54: error: ‘_cl_command_node’ has not been declared
+ 45 | cl_kernel Kernel, _cl_command_node *Command);
+ | ^~~~~~~~~~~~~~~~
+/var/tmp/portage/dev-libs/pocl-5.0/work/pocl-5.0/lib/CL/devices/almaif/AlmaIFDevice.hh:67:34: error: ‘pocl_mem_identifier’ has not been declared
+ 67 | virtual void writeDataToDevice(pocl_mem_identifier *DstMemId,
+ | ^~~~~~~~~~~~~~~~~~~
+/var/tmp/portage/dev-libs/pocl-5.0/work/pocl-5.0/lib/CL/devices/almaif/AlmaIFDevice.hh:71:35: error: ‘pocl_mem_identifier’ has not been declared
+ 71 | pocl_mem_identifier *SrcMemId, size_t Size,
+ | ^~~~~~~~~~~~~~~~~~~
+/var/tmp/portage/dev-libs/pocl-5.0/work/pocl-5.0/lib/CL/devices/almaif/AlmaIFDevice.hh:79:11: error: ‘cl_int’ does not name a type; did you mean ‘u_int’?
+ 79 | virtual cl_int allocateBuffer(pocl_mem_identifier *P, size_t Size);
+ | ^~~~~~
+ | u_int
+/var/tmp/portage/dev-libs/pocl-5.0/work/pocl-5.0/lib/CL/devices/almaif/AlmaIFDevice.hh:81:27: error: ‘pocl_mem_identifier’ has not been declared
+ 81 | virtual void freeBuffer(pocl_mem_identifier *P);
+ | ^~~~~~~~~~~~~~~~~~~
+/var/tmp/portage/dev-libs/pocl-5.0/work/pocl-5.0/lib/CL/devices/almaif/AlmaIFDevice.hh:83:38: error: ‘pocl_mem_identifier’ has not been declared
+ 83 | virtual size_t pointerDeviceOffset(pocl_mem_identifier *P);
+ | ^~~~~~~~~~~~~~~~~~~
+
+diff -Nuar a/lib/CL/devices/almaif/AlmaIFDevice.hh b/lib/CL/devices/almaif/AlmaIFDevice.hh
+--- a/lib/CL/devices/almaif/AlmaIFDevice.hh 2023-12-19 13:24:31.000000000 +0000
++++ b/lib/CL/devices/almaif/AlmaIFDevice.hh 2024-01-13 03:42:12.045091773 +0000
+@@ -34,6 +34,8 @@
+ #include <stdlib.h>
+ #include <string>
+
++#include "pocl_cl.h"
++
+ struct almaif_kernel_data_s;
+
+ class AlmaIFDevice {
diff --git a/dev-libs/pocl/pocl-5.0.ebuild b/dev-libs/pocl/pocl-5.0.ebuild
new file mode 100644
index 000000000000..16d02903db69
--- /dev/null
+++ b/dev-libs/pocl/pocl-5.0.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_MAX_SLOT=17
+inherit cmake llvm
+
+DESCRIPTION="Portable Computing Language (an implementation of OpenCL)"
+HOMEPAGE="http://portablecl.org https://github.com/pocl/pocl"
+SRC_URI="https://github.com/pocl/pocl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+# TODO: hsa tce
+IUSE="accel +conformance cuda debug examples float-conversion hardening +hwloc memmanager test"
+# Tests not yet passing, fragile in Portage environment(?)
+RESTRICT="!test? ( test ) test"
+
+# TODO: add dependencies for cuda
+# Note: No := on LLVM because it pulls in Clang
+# see llvm.eclass for why
+CLANG_DEPS="
+ !cuda? ( <sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):= )
+ cuda? ( <sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=[llvm_targets_NVPTX] )
+"
+RDEPEND="
+ dev-libs/libltdl
+ <sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):*
+ virtual/opencl
+
+ ${CLANG_DEPS}
+ debug? ( dev-util/lttng-ust:= )
+ hwloc? ( sys-apps/hwloc:=[cuda?] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ ${CLANG_DEPS}
+ virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}/${P}-missing-definitions-fix.patch" )
+
+llvm_check_deps() {
+ local usedep=$(usev cuda "[llvm_targets_NVPTX]")
+
+ # Clang is used at both build time (executed) and runtime
+ has_version -r "sys-devel/llvm:${LLVM_SLOT}${usedep}" && \
+ has_version -r "sys-devel/clang:${LLVM_SLOT}${usedep}" && \
+ has_version -b "sys-devel/clang:${LLVM_SLOT}${usedep}"
+}
+
+src_configure() {
+ local host_cpu_variants="generic"
+
+ if use amd64 ; then
+ # Use pocl's curated list of CPU variants which should contain a good match for any given amd64 CPU
+ host_cpu_variants="distro"
+ elif use ppc64 ; then
+ # A selection of architectures in which new Altivec / VSX features were added
+ # This attempts to recreate the amd64 "distro" option for ppc64
+ # See discussion in bug #831859
+ host_cpu_variants="pwr10;pwr9;pwr8;pwr7;pwr6;g5;a2;generic"
+ fi
+
+ local mycmakeargs=(
+ -DENABLE_HSA=OFF
+
+ -DENABLE_ICD=ON
+ -DPOCL_ICD_ABSOLUTE_PATH=ON
+ -DPOCL_INSTALL_PUBLIC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/OpenCL/vendors/pocl"
+
+ # only appends -flto
+ -DENABLE_IPO=OFF
+
+ -DENABLE_POCL_BUILDING=ON
+ -DKERNELLIB_HOST_CPU_VARIANTS="${host_cpu_variants}"
+
+ -DSTATIC_LLVM=OFF
+ -DWITH_LLVM_CONFIG=$(get_llvm_prefix -d "${LLVM_MAX_SLOT}")/bin/llvm-config
+
+ -DENABLE_ALMAIF_DEVICE=$(usex accel)
+ -DENABLE_CONFORMANCE=$(usex conformance)
+ -DENABLE_CUDA=$(usex cuda)
+ -DENABLE_HWLOC=$(usex hwloc)
+ -DENABLE_POCL_FLOAT_CONVERSION=$(usex float-conversion)
+ -DHARDENING_ENABLE=$(usex hardening)
+ -DPOCL_DEBUG_MESSAGES=$(usex debug)
+ -DUSE_POCL_MEMMANAGER=$(usex memmanager)
+ -DENABLE_TESTS=$(usex test)
+ )
+
+ cmake_src_configure
+}
+
+src_test() {
+ export POCL_BUILDING=1
+ export POCL_DEVICES=basic
+ export CTEST_OUTPUT_ON_FAILURE=1
+ export TEST_VERBOSE=1
+
+ # Referenced https://github.com/pocl/pocl/blob/master/.drone.yml
+ # But couldn't seem to get tests working yet
+ cmake_src_test
+}
+
+src_install() {
+ cmake_src_install
+
+ if use examples; then
+ dodoc -r examples
+ docompress -x /usr/share/doc/${P}/examples
+ fi
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/pocl/, dev-libs/pocl/files/
@ 2025-02-16 13:02 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2025-02-16 13:02 UTC (permalink / raw
To: gentoo-commits
commit: 0ce052001c1ee0ab5b68d5b5caf584c0750643f7
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 16 13:01:59 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 16 13:01:59 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ce05200
dev-libs/pocl: fix build w/ gcc-15
Closes: https://bugs.gentoo.org/940271
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-libs/pocl/files/pocl-6.0-gcc15.patch | 27 +++++++++++++++++++++++++++
dev-libs/pocl/pocl-6.0.ebuild | 6 +++++-
2 files changed, 32 insertions(+), 1 deletion(-)
diff --git a/dev-libs/pocl/files/pocl-6.0-gcc15.patch b/dev-libs/pocl/files/pocl-6.0-gcc15.patch
new file mode 100644
index 000000000000..6176e54bfecc
--- /dev/null
+++ b/dev-libs/pocl/files/pocl-6.0-gcc15.patch
@@ -0,0 +1,27 @@
+https://github.com/pocl/pocl/commit/3333cbc6a16fba0bc3f3c66ba6e68ce9bb46c549
+
+From 3333cbc6a16fba0bc3f3c66ba6e68ce9bb46c549 Mon Sep 17 00:00:00 2001
+From: Vitaly <vitaly@easycoding.org>
+Date: Mon, 27 Jan 2025 09:52:47 +0100
+Subject: [PATCH] Added missing cstdint header to fix build with libstdc++ 15.
+
+--- a/lib/CL/devices/spirv_parser.cc
++++ b/lib/CL/devices/spirv_parser.cc
+@@ -25,6 +25,7 @@
+
+ #include <algorithm>
+ #include <cassert>
++#include <cstdint>
+ #include <cstring>
+ #include <fstream>
+ #include <iostream>
+--- a/lib/CL/devices/spirv_parser.hh
++++ b/lib/CL/devices/spirv_parser.hh
+@@ -34,6 +34,7 @@
+ #define SPIRV_PARSER_EXPORT POCL_EXPORT
+ #endif
+
++#include <cstdint>
+ #include <map>
+ #include <memory>
+ #include <set>
diff --git a/dev-libs/pocl/pocl-6.0.ebuild b/dev-libs/pocl/pocl-6.0.ebuild
index 4141b49feb9a..f2d1f5c8bc9f 100644
--- a/dev-libs/pocl/pocl-6.0.ebuild
+++ b/dev-libs/pocl/pocl-6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -44,6 +44,10 @@ BDEPEND="
virtual/pkgconfig
"
+PATCHES=(
+ "${FILESDIR}"/${P}-gcc15.patch
+)
+
src_prepare() {
use cuda && cuda_src_prepare
cmake_src_prepare
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/pocl/, dev-libs/pocl/files/
@ 2025-02-16 13:02 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2025-02-16 13:02 UTC (permalink / raw
To: gentoo-commits
commit: beac36aef584a686a93818f9b36b1f346c9b660b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 16 13:02:16 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 16 13:02:16 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=beac36ae
dev-libs/pocl: drop 4.0, 5.0
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-libs/pocl/Manifest | 2 -
.../files/pocl-5.0-missing-definitions-fix.patch | 41 --------
dev-libs/pocl/pocl-4.0.ebuild | 113 --------------------
dev-libs/pocl/pocl-5.0.ebuild | 115 ---------------------
4 files changed, 271 deletions(-)
diff --git a/dev-libs/pocl/Manifest b/dev-libs/pocl/Manifest
index 3d8203f4e5c7..b203f45d594c 100644
--- a/dev-libs/pocl/Manifest
+++ b/dev-libs/pocl/Manifest
@@ -1,3 +1 @@
-DIST pocl-4.0.tar.gz 2140919 BLAKE2B 1e9dd4de4824dd4a9e2b0d053d1786062c135d3bf7ca99dc884657b89c651fca6c0f3dedb568439802a58b0bfabc10939ca344b0110ae5fdb31be06f596d2a48 SHA512 3835a9e8fc8562d50a91a11b807cf87a096891f5c27675127b66412eacff2e541b6143b49b4155f43a09f4e53faa062ec20f3b20badeca206ece9f45ad50f26a
-DIST pocl-5.0.tar.gz 2361502 BLAKE2B eca07953ff56e7e4ca10f71db12819547bc8ff28da26e569c3544edd802f9ded0a8bd0d9cb260069cfe3788f9bc6c84d6ae96c1148c4e92fe6268a95a60ee5b6 SHA512 c2d6c80cbcba7af1c31dfa794c2aa7be6d1ce2cc9900fbf6e0a1536747440602cdc0f1a84f81f85737818a7ea60b490558ef328b3b156e52c63db3fe4ce490b0
DIST pocl-6.0.tar.gz 2466652 BLAKE2B e074f35bfe8ccd70038fe05ca01da033849bed83075330f1149597455a5892281d4d09b8db5b4731e7e0c248d1ffdc8e8707c1ebe53d50624294ad92aa886be6 SHA512 a24efadbbb81c810cd5c4bbb8abfa75b9bbdfeca786e8471dd75d40a78024d04c1b5c5a7114e75e1eb70a1b6a3756bb47ba741de0f1c4d1416fbce4688d62cc0
diff --git a/dev-libs/pocl/files/pocl-5.0-missing-definitions-fix.patch b/dev-libs/pocl/files/pocl-5.0-missing-definitions-fix.patch
deleted file mode 100644
index 251bdad65bd6..000000000000
--- a/dev-libs/pocl/files/pocl-5.0-missing-definitions-fix.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Fixes missing definitions.
-
-FAILED: lib/CL/devices/almaif/CMakeFiles/pocl-devices-almaif.dir/MMAPDevice.cc.o
-/usr/bin/x86_64-pc-linux-gnu-g++ -DCL_HPP_TARGET_OPENCL_VERSION=300 -DCL_TARGET_OPENCL_VERSION=300 -DCL_USE_DEPRECATED_OPENCL_1_0_APIS -DCL_USE_DEPRECATED_OPENCL_1_1_APIS -DCL_USE_DEPRECATED_OPENCL_1_2_APIS -DCL_USE_DEPRECATED_OPENCL_2_0_APIS -DCL_USE_DEPRECATED_OPENCL_2_1_APIS -DCL_USE_DEPRECATED_OPENCL_2_2_APIS -Dpocl_devices_almaif_EXPORTS -I/var/tmp/portage/dev-libs/pocl-5.0/work/pocl-5.0_build -I/var/tmp/portage/dev-libs/pocl-5.0/work/pocl-5.0/include -I/var/tmp/portage/dev-libs/pocl-5.0/work/pocl-5.0/include/hpp -I/var/tmp/portage/dev-libs/pocl-5.0/work/pocl-5.0/lib/CL/devices -I/var/tmp/portage/dev-libs/pocl-5.0/work/pocl-5.0/lib/CL/. -O2 -pipe -march=x86-64 -mtune=generic -std=c++11 -fPIC -Wno-ignored-attributes -fvisibility=hidden -fvisibility-inlines-hidden -MD -MT lib/CL/devices/almaif/CMakeFiles/pocl-devices-almaif.dir/MMAPDevice.cc.o -MF lib/CL/devices/almaif/CMakeFiles/pocl-devices-almaif.dir/MMAPDevice.cc.o.d -o lib/CL/devices/almaif/CMakeFiles/pocl-devices-almaif.di
r/MMAPDevice.cc.o -c /var/tmp/portage/dev-libs/pocl-5.0/work/pocl-5.0/lib/CL/devices/almaif/MMAPDevice.cc
-In file included from /var/tmp/portage/dev-libs/pocl-5.0/work/pocl-5.0/lib/CL/devices/almaif/MMAPDevice.hh:28,
- from /var/tmp/portage/dev-libs/pocl-5.0/work/pocl-5.0/lib/CL/devices/almaif/MMAPDevice.cc:24:
-/var/tmp/portage/dev-libs/pocl-5.0/work/pocl-5.0/lib/CL/devices/almaif/AlmaIFDevice.hh:45:36: error: ‘cl_kernel’ has not been declared
- 45 | cl_kernel Kernel, _cl_command_node *Command);
- | ^~~~~~~~~
-/var/tmp/portage/dev-libs/pocl-5.0/work/pocl-5.0/lib/CL/devices/almaif/AlmaIFDevice.hh:45:54: error: ‘_cl_command_node’ has not been declared
- 45 | cl_kernel Kernel, _cl_command_node *Command);
- | ^~~~~~~~~~~~~~~~
-/var/tmp/portage/dev-libs/pocl-5.0/work/pocl-5.0/lib/CL/devices/almaif/AlmaIFDevice.hh:67:34: error: ‘pocl_mem_identifier’ has not been declared
- 67 | virtual void writeDataToDevice(pocl_mem_identifier *DstMemId,
- | ^~~~~~~~~~~~~~~~~~~
-/var/tmp/portage/dev-libs/pocl-5.0/work/pocl-5.0/lib/CL/devices/almaif/AlmaIFDevice.hh:71:35: error: ‘pocl_mem_identifier’ has not been declared
- 71 | pocl_mem_identifier *SrcMemId, size_t Size,
- | ^~~~~~~~~~~~~~~~~~~
-/var/tmp/portage/dev-libs/pocl-5.0/work/pocl-5.0/lib/CL/devices/almaif/AlmaIFDevice.hh:79:11: error: ‘cl_int’ does not name a type; did you mean ‘u_int’?
- 79 | virtual cl_int allocateBuffer(pocl_mem_identifier *P, size_t Size);
- | ^~~~~~
- | u_int
-/var/tmp/portage/dev-libs/pocl-5.0/work/pocl-5.0/lib/CL/devices/almaif/AlmaIFDevice.hh:81:27: error: ‘pocl_mem_identifier’ has not been declared
- 81 | virtual void freeBuffer(pocl_mem_identifier *P);
- | ^~~~~~~~~~~~~~~~~~~
-/var/tmp/portage/dev-libs/pocl-5.0/work/pocl-5.0/lib/CL/devices/almaif/AlmaIFDevice.hh:83:38: error: ‘pocl_mem_identifier’ has not been declared
- 83 | virtual size_t pointerDeviceOffset(pocl_mem_identifier *P);
- | ^~~~~~~~~~~~~~~~~~~
-
-diff -Nuar a/lib/CL/devices/almaif/AlmaIFDevice.hh b/lib/CL/devices/almaif/AlmaIFDevice.hh
---- a/lib/CL/devices/almaif/AlmaIFDevice.hh 2023-12-19 13:24:31.000000000 +0000
-+++ b/lib/CL/devices/almaif/AlmaIFDevice.hh 2024-01-13 03:42:12.045091773 +0000
-@@ -34,6 +34,8 @@
- #include <stdlib.h>
- #include <string>
-
-+#include "pocl_cl.h"
-+
- struct almaif_kernel_data_s;
-
- class AlmaIFDevice {
diff --git a/dev-libs/pocl/pocl-4.0.ebuild b/dev-libs/pocl/pocl-4.0.ebuild
deleted file mode 100644
index 1bedd3dc6ade..000000000000
--- a/dev-libs/pocl/pocl-4.0.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_MAX_SLOT=16
-inherit cmake llvm
-
-DESCRIPTION="Portable Computing Language (an implementation of OpenCL)"
-HOMEPAGE="http://portablecl.org https://github.com/pocl/pocl"
-SRC_URI="https://github.com/pocl/pocl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc64"
-# TODO: hsa tce
-IUSE="accel +conformance cuda debug examples float-conversion hardening +hwloc memmanager test"
-# Tests not yet passing, fragile in Portage environment(?)
-RESTRICT="!test? ( test ) test"
-
-# TODO: add dependencies for cuda
-# Note: No := on LLVM because it pulls in Clang
-# see llvm.eclass for why
-CLANG_DEPS="
- !cuda? ( <llvm-core/clang-$((${LLVM_MAX_SLOT} + 1)):= )
- cuda? ( <llvm-core/clang-$((${LLVM_MAX_SLOT} + 1)):=[llvm_targets_NVPTX] )
-"
-RDEPEND="
- dev-libs/libltdl
- <llvm-core/llvm-$((${LLVM_MAX_SLOT} + 1)):*
- virtual/opencl
-
- ${CLANG_DEPS}
- debug? ( dev-util/lttng-ust:= )
- hwloc? ( sys-apps/hwloc:=[cuda?] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- ${CLANG_DEPS}
- virtual/pkgconfig
-"
-
-llvm_check_deps() {
- local usedep=$(usev cuda "[llvm_targets_NVPTX]")
-
- # Clang is used at both build time (executed) and runtime
- has_version -r "llvm-core/llvm:${LLVM_SLOT}${usedep}" && \
- has_version -r "llvm-core/clang:${LLVM_SLOT}${usedep}" && \
- has_version -b "llvm-core/clang:${LLVM_SLOT}${usedep}"
-}
-
-src_configure() {
- local host_cpu_variants="generic"
-
- if use amd64 ; then
- # Use pocl's curated list of CPU variants which should contain a good match for any given amd64 CPU
- host_cpu_variants="distro"
- elif use ppc64 ; then
- # A selection of architectures in which new Altivec / VSX features were added
- # This attempts to recreate the amd64 "distro" option for ppc64
- # See discussion in bug #831859
- host_cpu_variants="pwr10;pwr9;pwr8;pwr7;pwr6;g5;a2;generic"
- fi
-
- local mycmakeargs=(
- -DENABLE_HSA=OFF
-
- -DENABLE_ICD=ON
- -DPOCL_ICD_ABSOLUTE_PATH=ON
- -DPOCL_INSTALL_PUBLIC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/OpenCL/vendors/pocl"
-
- # only appends -flto
- -DENABLE_IPO=OFF
-
- -DENABLE_POCL_BUILDING=ON
- -DKERNELLIB_HOST_CPU_VARIANTS="${host_cpu_variants}"
-
- -DSTATIC_LLVM=OFF
- -DWITH_LLVM_CONFIG=$(get_llvm_prefix -d "${LLVM_MAX_SLOT}")/bin/llvm-config
-
- -DENABLE_ALMAIF_DEVICE=$(usex accel)
- -DENABLE_CONFORMANCE=$(usex conformance)
- -DENABLE_CUDA=$(usex cuda)
- -DENABLE_HWLOC=$(usex hwloc)
- -DENABLE_POCL_FLOAT_CONVERSION=$(usex float-conversion)
- -DHARDENING_ENABLE=$(usex hardening)
- -DPOCL_DEBUG_MESSAGES=$(usex debug)
- -DUSE_POCL_MEMMANAGER=$(usex memmanager)
- -DENABLE_TESTS=$(usex test)
- )
-
- cmake_src_configure
-}
-
-src_test() {
- export POCL_BUILDING=1
- export POCL_DEVICES=basic
- export CTEST_OUTPUT_ON_FAILURE=1
- export TEST_VERBOSE=1
-
- # Referenced https://github.com/pocl/pocl/blob/master/.drone.yml
- # But couldn't seem to get tests working yet
- cmake_src_test
-}
-
-src_install() {
- cmake_src_install
-
- if use examples; then
- dodoc -r examples
- docompress -x /usr/share/doc/${P}/examples
- fi
-}
diff --git a/dev-libs/pocl/pocl-5.0.ebuild b/dev-libs/pocl/pocl-5.0.ebuild
deleted file mode 100644
index 602ca5e8fe42..000000000000
--- a/dev-libs/pocl/pocl-5.0.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_MAX_SLOT=17
-inherit cmake llvm
-
-DESCRIPTION="Portable Computing Language (an implementation of OpenCL)"
-HOMEPAGE="http://portablecl.org https://github.com/pocl/pocl"
-SRC_URI="https://github.com/pocl/pocl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
-# TODO: hsa tce
-IUSE="accel +conformance cuda debug examples float-conversion hardening +hwloc memmanager test"
-# Tests not yet passing, fragile in Portage environment(?)
-RESTRICT="!test? ( test ) test"
-
-# TODO: add dependencies for cuda
-# Note: No := on LLVM because it pulls in Clang
-# see llvm.eclass for why
-CLANG_DEPS="
- !cuda? ( <llvm-core/clang-$((${LLVM_MAX_SLOT} + 1)):= )
- cuda? ( <llvm-core/clang-$((${LLVM_MAX_SLOT} + 1)):=[llvm_targets_NVPTX] )
-"
-RDEPEND="
- dev-libs/libltdl
- <llvm-core/llvm-$((${LLVM_MAX_SLOT} + 1)):*
- virtual/opencl
-
- ${CLANG_DEPS}
- debug? ( dev-util/lttng-ust:= )
- hwloc? ( sys-apps/hwloc:=[cuda?] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- ${CLANG_DEPS}
- virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}/${P}-missing-definitions-fix.patch" )
-
-llvm_check_deps() {
- local usedep=$(usev cuda "[llvm_targets_NVPTX]")
-
- # Clang is used at both build time (executed) and runtime
- has_version -r "llvm-core/llvm:${LLVM_SLOT}${usedep}" && \
- has_version -r "llvm-core/clang:${LLVM_SLOT}${usedep}" && \
- has_version -b "llvm-core/clang:${LLVM_SLOT}${usedep}"
-}
-
-src_configure() {
- local host_cpu_variants="generic"
-
- if use amd64 ; then
- # Use pocl's curated list of CPU variants which should contain a good match for any given amd64 CPU
- host_cpu_variants="distro"
- elif use ppc64 ; then
- # A selection of architectures in which new Altivec / VSX features were added
- # This attempts to recreate the amd64 "distro" option for ppc64
- # See discussion in bug #831859
- host_cpu_variants="pwr10;pwr9;pwr8;pwr7;pwr6;g5;a2;generic"
- fi
-
- local mycmakeargs=(
- -DENABLE_HSA=OFF
-
- -DENABLE_ICD=ON
- -DPOCL_ICD_ABSOLUTE_PATH=ON
- -DPOCL_INSTALL_PUBLIC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/OpenCL/vendors/pocl"
-
- # only appends -flto
- -DENABLE_IPO=OFF
-
- -DENABLE_POCL_BUILDING=ON
- -DKERNELLIB_HOST_CPU_VARIANTS="${host_cpu_variants}"
-
- -DSTATIC_LLVM=OFF
- -DWITH_LLVM_CONFIG=$(get_llvm_prefix -d "${LLVM_MAX_SLOT}")/bin/llvm-config
-
- -DENABLE_ALMAIF_DEVICE=$(usex accel)
- -DENABLE_CONFORMANCE=$(usex conformance)
- -DENABLE_CUDA=$(usex cuda)
- -DENABLE_HWLOC=$(usex hwloc)
- -DENABLE_POCL_FLOAT_CONVERSION=$(usex float-conversion)
- -DHARDENING_ENABLE=$(usex hardening)
- -DPOCL_DEBUG_MESSAGES=$(usex debug)
- -DUSE_POCL_MEMMANAGER=$(usex memmanager)
- -DENABLE_TESTS=$(usex test)
- )
-
- cmake_src_configure
-}
-
-src_test() {
- export POCL_BUILDING=1
- export POCL_DEVICES=basic
- export CTEST_OUTPUT_ON_FAILURE=1
- export TEST_VERBOSE=1
-
- # Referenced https://github.com/pocl/pocl/blob/master/.drone.yml
- # But couldn't seem to get tests working yet
- cmake_src_test
-}
-
-src_install() {
- cmake_src_install
-
- if use examples; then
- dodoc -r examples
- docompress -x /usr/share/doc/${P}/examples
- fi
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2025-02-16 13:03 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-09-22 22:31 [gentoo-commits] repo/gentoo:master commit in: dev-libs/pocl/, dev-libs/pocl/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2023-04-18 6:51 Sam James
2023-11-25 8:54 Sam James
2024-07-08 11:39 Sam James
2025-02-16 13:02 Sam James
2025-02-16 13:02 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox