Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

VecGeom: Update to version 1.2.7 #8864

Merged
merged 6 commits into from
Dec 23, 2023
Merged

VecGeom: Update to version 1.2.7 #8864

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0cb1cb9
VecGeom: Update to version 1.2.6
smuzaffar Dec 8, 2023
251079a
set VecGeom_GIT_DESCRIBE to avoid vecgeom searching for git tag
smuzaffar Dec 8, 2023
02d5429
set VecCore_DIr; fix vectorization lib path
smuzaffar Dec 8, 2023
c1e7b2e
update vecgeom to v2.0.0-rc2
smuzaffar Dec 9, 2023
e98e81b
Update vecgeom.spec
smuzaffar Dec 19, 2023
4fbb511
fix VecCore_DIR relocation
smuzaffar Dec 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions geant4.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,6 @@ fi
rm -rf ../build
mkdir ../build
cd ../build
%if %{use_vecgeom}
export VecGeom_DIR=${VECGEOM_ROOT}/lib/cmake/VecGeom
%endif

cmake ../%{n}.%{realversion} \
-DCMAKE_CXX_COMPILER="g++" \
Expand All @@ -59,6 +56,10 @@ cmake ../%{n}.%{realversion} \
-DGEANT4_INSTALL_EXAMPLES=OFF \
-DGEANT4_USE_SYSTEM_CLHEP=ON \
-DGEANT4_USE_SYSTEM_EXPAT=ON \
%if %{use_vecgeom}
-DVecGeom_DIR=${VECGEOM_ROOT}/lib64/cmake/VecGeom \
-DVecCore_DIR=${VECGEOM_ROOT}/lib64/cmake/VecCore \
%endif
-DCMAKE_PREFIX_PATH="${XERCES_C_ROOT};${CLHEP_ROOT};${EXPAT_ROOT};${ZLIB_ROOT};${VECGEOM_ROOT}" \
-DGEANT4_USE_SYSTEM_ZLIB=ON \
-DGEANT4_BUILD_MULTITHREADED=ON
Expand Down
2 changes: 1 addition & 1 deletion scram-tools.file/tools/vecgeom/vectorized.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<tool name="vecgeom_@TOOL_VECTORIZATION@" version="@TOOL_VERSION@">
<client>
<environment name="@TOOL_VECTORIZATION_KEY@_LIBDIR" default="@TOOL_ROOT@/lib" type="path"/>
<environment name="@TOOL_VECTORIZATION_KEY@_LIBDIR" default="@TOOL_ROOT@/lib64" type="path"/>
</client>
</tool>
10 changes: 8 additions & 2 deletions vecgeom.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
### RPM external vecgeom v1.2.1
### RPM external vecgeom v1.2.7
## INCLUDE compilation_flags
## INCLUDE compilation_flags_lto
## INCLUDE cpp-standard
%define tag 12fc8ba12efe93de5aaa9ff8e51e093ae93a1633
%define tag be99ff9e6b26fa5e0063f8bd21df23cb87911bf8
Source: git+https://gitlab.cern.ch/VecGeom/VecGeom.git?obj=master/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz
BuildRequires: cmake gmake
%define keep_archives true
%define vecgeom_backend Scalar
%define vecgeom_version %(echo %{realversion} | sed -e 's|^v||;s|-.*||')
Patch0: vecgeom-fix-vector

%define build_flags %{?arch_build_flags} %{?lto_build_flags} %{?pgo_build_flags}
Expand All @@ -22,6 +23,7 @@ mkdir ../build
cd ../build

cmake ../%{n}-%{realversion} \
-DVecGeom_GIT_DESCRIBE="%{vecgeom_version};;" \
-DCMAKE_INSTALL_PREFIX=%{i} \
-DCMAKE_CXX_STANDARD:STRING="%{cms_cxx_standard}" \
-DCMAKE_AR=$(which gcc-ar) \
Expand Down Expand Up @@ -49,3 +51,7 @@ make %{makeprocesses} VERBOSE=1
%install
cd ../build
make %{makeprocesses} install VERBOSE=1
sed -i -e 's|set(VecCore_DIR .*|set(VecCore_DIR "%{i}/lib64/cmake/VecCore")|' %{i}/lib64/cmake/VecGeom/VecGeomConfig.cmake

%post
%{relocateConfig}lib64/cmake/VecGeom/VecGeomConfig.cmake