diff options
Diffstat (limited to 'sci-physics/opticks/files')
6 files changed, 0 insertions, 167 deletions
diff --git a/sci-physics/opticks/files/opticks-0.0.1_cuda-helper.patch b/sci-physics/opticks/files/opticks-0.0.1_cuda-helper.patch deleted file mode 100644 index 8893fb279..000000000 --- a/sci-physics/opticks/files/opticks-0.0.1_cuda-helper.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: opticks-0.0.1_p20191110/cmake/Modules/FindOpticksCUDA.cmake -=================================================================== ---- opticks-0.0.1_p20191110.orig/cmake/Modules/FindOpticksCUDA.cmake -+++ opticks-0.0.1_p20191110/cmake/Modules/FindOpticksCUDA.cmake -@@ -52,7 +52,7 @@ if(OpticksCUDA_FOUND) - HELPER_CUDA_INCLUDE_DIR - NAMES "helper_cuda.h" - PATHS -- "${CUDA_TOOLKIT_ROOT_DIR}/samples/common/inc" -+ "${CUDA_TOOLKIT_ROOT_DIR}/sdk/common/inc" - "${CMAKE_CURRENT_LIST_DIR}/include/helper_cuda_fallback/${CUDA_VERSION}" - ) - if(HELPER_CUDA_INCLUDE_DIR) diff --git a/sci-physics/opticks/files/opticks-0.0.1_extG4-CLHEP.patch b/sci-physics/opticks/files/opticks-0.0.1_extG4-CLHEP.patch deleted file mode 100644 index 9df5373d4..000000000 --- a/sci-physics/opticks/files/opticks-0.0.1_extG4-CLHEP.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: opticks-0.0.1_p20191110/extg4/CMakeLists.txt -=================================================================== ---- opticks-0.0.1_p20191110.orig/extg4/CMakeLists.txt -+++ opticks-0.0.1_p20191110/extg4/CMakeLists.txt -@@ -27,6 +27,7 @@ very focussed converter classes. - - set(G4_VERBOSE ON) - find_package(G4 REQUIRED MODULE) -+find_package(CLHEP REQUIRED) - find_package(GGeo REQUIRED CONFIG) - - # just for X4GDMLWrite -@@ -143,6 +144,7 @@ set(HEADERS - add_library( ${name} SHARED ${SOURCES} ${HEADERS} ) - target_link_libraries( ${name} PUBLIC - Opticks::G4 -+ CLHEP - Opticks::GGeo - Opticks::OpticksXercesC - ) diff --git a/sci-physics/opticks/files/opticks-0.0.1_nvcc-flags.patch b/sci-physics/opticks/files/opticks-0.0.1_nvcc-flags.patch deleted file mode 100644 index 4360da18b..000000000 --- a/sci-physics/opticks/files/opticks-0.0.1_nvcc-flags.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: opticks-0.0.1_p20191110/cmake/Modules/OpticksCUDAFlags.cmake -=================================================================== ---- opticks-0.0.1_p20191110.orig/cmake/Modules/OpticksCUDAFlags.cmake -+++ opticks-0.0.1_p20191110/cmake/Modules/OpticksCUDAFlags.cmake -@@ -18,6 +18,7 @@ if(NOT (COMPUTE_CAPABILITY LESS 30)) - list(APPEND CUDA_NVCC_FLAGS "-O2") - #list(APPEND CUDA_NVCC_FLAGS "-DVERBOSE") - list(APPEND CUDA_NVCC_FLAGS "--use_fast_math") -+ list(APPEND CUDA_NVCC_FLAGS $ENV{NVCCFLAGS}) - - #list(APPEND CUDA_NVCC_FLAGS "-m64") - #list(APPEND CUDA_NVCC_FLAGS "--disable-warnings") diff --git a/sci-physics/opticks/files/opticks-0.0.1_okconf.patch b/sci-physics/opticks/files/opticks-0.0.1_okconf.patch deleted file mode 100644 index 58cedbf06..000000000 --- a/sci-physics/opticks/files/opticks-0.0.1_okconf.patch +++ /dev/null @@ -1,45 +0,0 @@ -Index: opticks-0.0.1_p20191110/cmake/Modules/OpticksBuildOptions.cmake -=================================================================== ---- opticks-0.0.1_p20191110.orig/cmake/Modules/OpticksBuildOptions.cmake -+++ opticks-0.0.1_p20191110/cmake/Modules/OpticksBuildOptions.cmake -@@ -26,7 +26,7 @@ RPATH setup docs - - #]=] - -- -+find_package(okconf REQUIRED CONFIG) - #message(STATUS "OpticksBuildOptions.cmake Configuring ${name}") - message(STATUS "Configuring ${name}") - -@@ -92,31 +92,6 @@ set(BUILD_SHARED_LIBS ON) - # to check the RPATH of a library or executable use chrpath on it, eg: chrpath $(which OKTest) - # - -- --if(UNIX AND NOT APPLE) -- if(CMAKE_INSTALL_PREFIX STREQUAL ${OPTICKS_PREFIX}) -- set(CMAKE_INSTALL_RPATH "$ORIGIN/../lib64:$ORIGIN/../externals/lib:$ORIGIN/../externals/lib64:$ORIGIN/../externals/OptiX/lib64") -- else() -- message(STATUS " Below two strings differ : forced to use absolute RPATH ") -- message(STATUS " CMAKE_INSTALL_PREFIX : ${CMAKE_INSTALL_PREFIX} ") -- message(STATUS " OPTICKS_PREFIX : ${OPTICKS_PREFIX} ") -- set(ABSOLUTE_INSTALL_RPATH -- ${OPTICKS_PREFIX}/lib64 -- ${OPTICKS_PREFIX}/externals/lib -- ${OPTICKS_PREFIX}/externals/lib64 -- ${OPTICKS_PREFIX}/externals/OptiX/lib64 -- ) -- set(CMAKE_INSTALL_RPATH "${ABSOLUTE_INSTALL_RPATH}") -- endif() -- --elseif(APPLE) --set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) --endif() -- -- -- -- -- - include(OpticksCXXFlags) - - diff --git a/sci-physics/opticks/files/opticks-0.0.1_python-helper.patch b/sci-physics/opticks/files/opticks-0.0.1_python-helper.patch deleted file mode 100644 index 255e0ee1a..000000000 --- a/sci-physics/opticks/files/opticks-0.0.1_python-helper.patch +++ /dev/null @@ -1,48 +0,0 @@ -Index: opticks-0.0.1_p20191110/ana/base.py -=================================================================== ---- opticks-0.0.1_p20191110.orig/ana/base.py -+++ opticks-0.0.1_p20191110/ana/base.py -@@ -27,7 +27,7 @@ Mostly Non-numpy basics, just numpy conf - import numpy as np - import os, logging, json, ctypes, subprocess, datetime, re - from collections import OrderedDict as odict --from opticks.ana.enum import Enum -+from enum import Enum - - log = logging.getLogger(__name__) - -Index: opticks-0.0.1_p20191110/ana/OpticksFlags.py -=================================================================== ---- opticks-0.0.1_p20191110.orig/ana/OpticksFlags.py -+++ opticks-0.0.1_p20191110/ana/OpticksFlags.py -@@ -7,7 +7,7 @@ Used from optickscore/CMakeLists.txt - - """ - import os, re, logging, argparse --from opticks.ana.base import json_save_ -+from base import json_save_ - - log = logging.getLogger(__name__) - -Index: opticks-0.0.1_p20191110/optickscore/CMakeLists.txt -=================================================================== ---- opticks-0.0.1_p20191110.orig/optickscore/CMakeLists.txt -+++ opticks-0.0.1_p20191110/optickscore/CMakeLists.txt -@@ -153,7 +153,7 @@ add_custom_command( - OUTPUT - ${PYINI} - COMMAND -- enum.py ${HDR} --quiet --inipath ${PYINI} -+ python2 ${CMAKE_CURRENT_SOURCE_DIR}/../ana/enum.py ${HDR} --quiet --inipath ${PYINI} - DEPENDS - ${HDR} - ) -@@ -167,7 +167,7 @@ add_custom_command( - OUTPUT - ${PYJS} - COMMAND -- OpticksFlags.py ${CCFL} --quiet --jsonpath ${PYJS} -+ python2 ${CMAKE_CURRENT_SOURCE_DIR}/../ana/OpticksFlags.py ${CCFL} --quiet --jsonpath ${PYJS} - DEPENDS - ${CCFL} - ) diff --git a/sci-physics/opticks/files/opticks-0.0.1_split-cmake.patch b/sci-physics/opticks/files/opticks-0.0.1_split-cmake.patch deleted file mode 100644 index 213c6bd3b..000000000 --- a/sci-physics/opticks/files/opticks-0.0.1_split-cmake.patch +++ /dev/null @@ -1,29 +0,0 @@ -Index: opticks-0.0.1_p20191110/CMakeLists.txt -=================================================================== ---- opticks-0.0.1_p20191110.orig/CMakeLists.txt -+++ opticks-0.0.1_p20191110/CMakeLists.txt -@@ -56,12 +56,11 @@ project(${name} VERSION 0.1.0) - include(OpticksBuildOptions) - - set(INTEGRATED_SUBDIRS -- okconf - sysrap --#[=[ - boostrap - npy - optickscore -+ yoctoglrap - ggeo - assimprap - openmeshrap -@@ -73,9 +72,9 @@ set(INTEGRATED_SUBDIRS - oglrap - opticksgl - ok -+ extg4 - cfg4 - okg4 --#]=] - ) - - |