Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion scram-tools.file/tools/celeritas/celeritas.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
<tool name="@TOOL@" version="@TOOL_VERSION@" revision="3">
<tool name="@TOOL@" version="@TOOL_VERSION@" revision="4">
<info url="https://github.com/celeritas-project/celeritas"/>
<lib name="accel"/>
<lib name="celeritas"/>
<lib name="geocel"/>
<lib name="corecel"/>
<lib name="g4vg"/>
<client>
<environment name="@TOOL_BASE@" default="@TOOL_ROOT@"/>
<environment name="INCLUDE" default="$@TOOL_BASE@/include"/>
Expand Down
3 changes: 2 additions & 1 deletion scram-tools.file/tools/geant4/geant4core.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<tool name="geant4core" version="@TOOL_VERSION@" revision="1">
<tool name="geant4core" version="@TOOL_VERSION@" revision="2">
<lib name="G4digits_hits"/>
<lib name="G4error_propagation"/>
<lib name="G4event"/>
Expand All @@ -20,6 +20,7 @@
<lib name="G4tracking"/>
<lib name="G4track"/>
<lib name="G4analysis"/>
<lib name="G4ptl"/>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a little odd, why would CMSSW need PTL now and not before? Celeritas doesn't link against it or the catch-all ${Geant4_LIBRARIES} (aside from our tests/examples which shouldn't affect CMSSW). @sanmayphy

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sethrj somehow this was needed after adding geocel. My observations were described in a slack thread; I'll tag you

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For future reference:

sed -i '/<lib name="celeritas"\/>/a \ \ <lib name="geocel"\/>' $CMSSW_BASE/config/toolbox/el8_amd64_gcc12/tools/selected/celeritas.xml
scram setup celeritas
scram b clean
scram b

resulted in an error:

>> Building shared library tmp/el8_amd64_gcc12/src/SimG4Core/Application/src/SimG4CoreApplication/libSimG4CoreApplication.so
lto-wrapper: warning: Extra option to '-Xassembler': --compress-debug-sections, dropping all '-Xassembler' and '-Wa' options.
/cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02906/el8_amd64_gcc12/external/gcc/12.3.1-40d504be6370b5a30e3947a6e575ca28/bin/../lib/gcc/x86_64-redhat-linux-gnu/12.3.1/../../../../x86_64-redhat-linux-gnu/bin/ld.bfd: tmp/el8_amd64_gcc12/src/SimG4Core/Application/src/SimG4CoreApplication/ccYmfNUF.ltrans19.ltrans.o: in function `PTL::TaskManager::~TaskManager()':
<artificial>:(.text+0x356): undefined reference to `PTL::ThreadPool::destroy_threadpool()'
/cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02906/el8_amd64_gcc12/external/gcc/12.3.1-40d504be6370b5a30e3947a6e575ca28/bin/../lib/gcc/x86_64-redhat-linux-gnu/12.3.1/../../../../x86_64-redhat-linux-gnu/bin/ld.bfd: tmp/el8_amd64_gcc12/src/SimG4Core/Application/src/SimG4CoreApplication/ccYmfNUF.ltrans19.ltrans.o: in function `PTL::TaskManager::~TaskManager()':
<artificial>:(.text+0x3bb): undefined reference to `PTL::ThreadPool::destroy_threadpool()'
/cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02906/el8_amd64_gcc12/external/gcc/12.3.1-40d504be6370b5a30e3947a6e575ca28/bin/../lib/gcc/x86_64-redhat-linux-gnu/12.3.1/../../../../x86_64-redhat-linux-gnu/bin/ld.bfd: tmp/el8_amd64_gcc12/src/SimG4Core/Application/src/SimG4CoreApplication/ccYmfNUF.ltrans34.ltrans.o: in function `celeritas::VecgeomParams::build_volumes_geant4(G4VPhysicalVolume const*)':
<artificial>:(.text+0x79c6): undefined reference to `g4vg::convert(G4VPhysicalVolume const*, g4vg::Options const&)'
collect2: error: ld returned 1 exit status
gmake: *** [config/SCRAM/GMake/Makefile.rules:1920: tmp/el8_amd64_gcc12/src/SimG4Core/Application/src/SimG4CoreApplication/libSimG4CoreApplication.so] Error 1
gmake: *** [There are compilation/build errors. Please see the detail log above.] Error 2

<client>
<environment name="GEANT4CORE_BASE" default="@TOOL_ROOT@"/>
<environment name="LIBDIR" default="$GEANT4CORE_BASE/lib64"/>
Expand Down