commit: 171f7a79c4ae755f718a27474696661dc3cb6749
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Dec 30 17:47:16 2023 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sun Dec 31 08:50:11 2023 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=171f7a79
dev-python/dpctl: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
.../files/dpctl-0.13.0-dont-fetch-pybind.patch | 21 ------
.../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-include-tuple.patch | 47 -------------
4 files changed, 171 deletions(-)
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
deleted file mode 100644
index b7dab5c75..000000000
--- a/dev-python/dpctl/files/dpctl-0.13.0-dont-fetch-pybind.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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)
-
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
deleted file mode 100644
index ac0301886..000000000
--- a/dev-python/dpctl/files/dpctl-0.14.0-dont-fetch-level-zero.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-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)
-- message(FATAL_ERROR
-- "Could not get the name for the latest release."
-- )
-- endif()
--
-- # Use git describe to get latest tag name
-- execute_process(
-- COMMAND ${GIT_EXECUTABLE} checkout ${latest_tag}
-- 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 checkout the latest release."
-- )
-- endif()
--
- # Populate the path to the headers
- find_path(LEVEL_ZERO_INCLUDE_DIR
- NAMES zet_api.h
-- PATHS ${CMAKE_BINARY_DIR}/level-zero/include
-+ PATHS /usr/include/level_zero
- NO_DEFAULT_PATH
- NO_CMAKE_ENVIRONMENT_PATH
- NO_CMAKE_PATH
diff --git a/dev-python/dpctl/files/dpctl-0.14.0-dont-fetch-pybind.patch
b/dev-python/dpctl/files/dpctl-0.14.0-dont-fetch-pybind.patch
deleted file mode 100644
index b2b8c5d81..000000000
--- a/dev-python/dpctl/files/dpctl-0.14.0-dont-fetch-pybind.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index da138c1..ecab139 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -28,15 +28,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.10.1.tar.gz
-- URL_HASH
SHA256=111014b516b625083bef701df7880f78c2243835abdb263065b6b59b960b6bad
--)
--FetchContent_MakeAvailable(pybind11)
-+include(/usr/share/cmake/pybind11/pybind11Config.cmake)
-
- add_subdirectory(dpctl)
-
diff --git a/dev-python/dpctl/files/dpctl-0.14.0-include-tuple.patch
b/dev-python/dpctl/files/dpctl-0.14.0-include-tuple.patch
deleted file mode 100644
index 44b950cb6..000000000
--- a/dev-python/dpctl/files/dpctl-0.14.0-include-tuple.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From d0d3e6f1a9ffbac91f24cc06abce6dcad6509a6b Mon Sep 17 00:00:00 2001
-From: Julien Jerphanion <[email protected]>
-Date: Tue, 6 Dec 2022 10:24:26 +0100
-Subject: [PATCH 1/2] MAINT Include tuple in 'utils/strided_iters.hpp'
-
-This include directive seems to have been forgotten and it is impossible
-for me to compile dpctl without it.
----
- dpctl/tensor/libtensor/include/utils/strided_iters.hpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/dpctl/tensor/libtensor/include/utils/strided_iters.hpp
b/dpctl/tensor/libtensor/include/utils/strided_iters.hpp
-index c24ed54941..595ad3f4a7 100644
---- a/dpctl/tensor/libtensor/include/utils/strided_iters.hpp
-+++ b/dpctl/tensor/libtensor/include/utils/strided_iters.hpp
-@@ -30,6 +30,7 @@
- #include <array>
- #include <numeric> // std::iota
- #include <vector>
-+#include <tuple>
-
- /* An N-dimensional array can be stored in a single
- * contiguous chunk of memory by contiguously laying
-
-From f75ccd8c8aeaae92f0cb03874f93be5e7a63a6a7 Mon Sep 17 00:00:00 2001
-From: Julien Jerphanion <[email protected]>
-Date: Tue, 6 Dec 2022 14:45:40 +0100
-Subject: [PATCH 2/2] Make clang-format happy
-
----
- dpctl/tensor/libtensor/include/utils/strided_iters.hpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dpctl/tensor/libtensor/include/utils/strided_iters.hpp
b/dpctl/tensor/libtensor/include/utils/strided_iters.hpp
-index 595ad3f4a7..0abd7f4f2a 100644
---- a/dpctl/tensor/libtensor/include/utils/strided_iters.hpp
-+++ b/dpctl/tensor/libtensor/include/utils/strided_iters.hpp
-@@ -29,8 +29,8 @@
- #include <algorithm> // sort
- #include <array>
- #include <numeric> // std::iota
--#include <vector>
- #include <tuple>
-+#include <vector>
-
- /* An N-dimensional array can be stored in a single
- * contiguous chunk of memory by contiguously laying
