-
Notifications
You must be signed in to change notification settings - Fork 21
Add phlex geomodel slc9 #212
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.
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
base: main
Are you sure you want to change the base?
Changes from all commits
08bf9b1
01432cf
dc4a3e4
ce6d817
7f350ce
6913cbe
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| package: cetmodules | ||
| version: "%(tag_basename)s" | ||
| tag: 4.01.01 | ||
| source: https://github.com/FNALssi/cetmodules | ||
| build_requires: | ||
| - CMake | ||
| - "GCC-Toolchain:(?!osx)" | ||
| - alibuild-recipe-tools | ||
| --- | ||
| #!/bin/bash -e | ||
|
|
||
| cmake -S "$SOURCEDIR" -B . \ | ||
| -DCMAKE_INSTALL_PREFIX="$INSTALLROOT" \ | ||
| ${CMAKE_GENERATOR:+-G "$CMAKE_GENERATOR"} \ | ||
| ${CMAKE_BUILD_TYPE:+-DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE} | ||
|
|
||
| cmake --build . --target install ${JOBS:+-- -j$JOBS} | ||
|
|
||
| # Patch config so find_package(cetmodules) also includes the modules | ||
| # that cetmodules' own CMakeLists.txt loads when used via FetchContent. | ||
| # All use include_guard() so double-inclusion is safe. | ||
| cat >> "$INSTALLROOT/share/cetmodules/cmake/cetmodulesConfig.cmake" <<'EOF' | ||
| include(CetProvideDependency) | ||
| include(CetCMakeEnv) | ||
| include(CetCMakeUtils) | ||
| include(CetCMakeConfig) | ||
| include(CetMake) | ||
| EOF | ||
|
|
||
| mkdir -p "$INSTALLROOT/etc/modulefiles" | ||
| alibuild-generate-module --cmake > "$INSTALLROOT/etc/modulefiles/$PKGNAME" |
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| @@ -0,0 +1,47 @@ | ||||||||||||||||||||||||
| package: GeoModel | ||||||||||||||||||||||||
| version: "%(tag_basename)s" | ||||||||||||||||||||||||
| tag: "6.24.0" | ||||||||||||||||||||||||
| source: https://gitlab.cern.ch/GeoModelDev/GeoModel.git | ||||||||||||||||||||||||
| requires: | ||||||||||||||||||||||||
| - sqlite | ||||||||||||||||||||||||
| - XercesC | ||||||||||||||||||||||||
| - nlohmann_json | ||||||||||||||||||||||||
| - Eigen3 | ||||||||||||||||||||||||
| - GEANT4 | ||||||||||||||||||||||||
| build_requires: | ||||||||||||||||||||||||
| - CMake | ||||||||||||||||||||||||
| - "GCC-Toolchain:(?!osx)" | ||||||||||||||||||||||||
| - alibuild-recipe-tools | ||||||||||||||||||||||||
| env: | ||||||||||||||||||||||||
| GEOMODEL_ROOT: "$GEOMODEL_ROOT" | ||||||||||||||||||||||||
| prepend_path: | ||||||||||||||||||||||||
| ROOT_INCLUDE_PATH: "$GEOMODEL_ROOT/include" | ||||||||||||||||||||||||
| LD_LIBRARY_PATH: "$GEOMODEL_ROOT/lib" | ||||||||||||||||||||||||
| --- | ||||||||||||||||||||||||
| #!/bin/bash -e | ||||||||||||||||||||||||
|
|
||||||||||||||||||||||||
| cmake "$SOURCEDIR" \ | ||||||||||||||||||||||||
| -DCMAKE_INSTALL_PREFIX="$INSTALLROOT" \ | ||||||||||||||||||||||||
| -DCMAKE_BUILD_TYPE="$CMAKE_BUILD_TYPE" \ | ||||||||||||||||||||||||
| -DCMAKE_CXX_STANDARD="${CMAKE_CXX_STANDARD:-20}" \ | ||||||||||||||||||||||||
| -DCMAKE_INSTALL_LIBDIR=lib \ | ||||||||||||||||||||||||
| -DGEOMODEL_USE_BUILTIN_JSON=OFF \ | ||||||||||||||||||||||||
| -DGEOMODEL_USE_BUILTIN_XERCESC=OFF \ | ||||||||||||||||||||||||
| -DGEOMODEL_USE_BUILTIN_EIGEN3=OFF \ | ||||||||||||||||||||||||
| -DGEOMODEL_BUILD_TOOLS=ON \ | ||||||||||||||||||||||||
| -DGEOMODEL_BUILD_GEOMODELG4=ON \ | ||||||||||||||||||||||||
| -DGEOMODEL_BUILD_FULLSIMLIGHT=ON \ | ||||||||||||||||||||||||
| -DGEOMODEL_BUILD_VISUALIZATION=OFF \ | ||||||||||||||||||||||||
| -DGEOMODEL_BUILD_TESTING=OFF | ||||||||||||||||||||||||
|
|
||||||||||||||||||||||||
| cmake --build . -- ${JOBS:+-j$JOBS} install | ||||||||||||||||||||||||
|
|
||||||||||||||||||||||||
| MODULEDIR="$INSTALLROOT/etc/modulefiles" | ||||||||||||||||||||||||
| MODULEFILE="$MODULEDIR/$PKGNAME" | ||||||||||||||||||||||||
| mkdir -p "$MODULEDIR" | ||||||||||||||||||||||||
| alibuild-generate-module --bin --lib > "$MODULEFILE" | ||||||||||||||||||||||||
| cat >> "$MODULEFILE" <<EoF | ||||||||||||||||||||||||
| # Our environment | ||||||||||||||||||||||||
| set GEOMODEL_ROOT \$::env(BASEDIR)/$PKGNAME/\$version | ||||||||||||||||||||||||
| prepend-path ROOT_INCLUDE_PATH \$GEOMODEL_ROOT/include | ||||||||||||||||||||||||
| EoF | ||||||||||||||||||||||||
|
Comment on lines
+43
to
+47
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Missing Line 45 uses Proposed fix cat >> "$MODULEFILE" <<EoF
# Our environment
set GEOMODEL_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
+setenv GEOMODEL_ROOT \$GEOMODEL_ROOT
prepend-path ROOT_INCLUDE_PATH \$GEOMODEL_ROOT/include
EoF📝 Committable suggestion
Suggested change
🤖 Prompt for AI Agents |
||||||||||||||||||||||||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| package: jsonnet | ||
| version: "%(tag_basename)s" | ||
| tag: v0.20.0 | ||
| source: https://github.com/google/jsonnet | ||
| requires: | ||
| - "GCC-Toolchain:(?!osx)" | ||
| - nlohmann_json | ||
| build_requires: | ||
| - CMake | ||
| - alibuild-recipe-tools | ||
| --- | ||
| #!/bin/bash -e | ||
|
|
||
| # jsonnet's USE_SYSTEM_JSON does find_package(nlohmann_json) but the source | ||
| # includes "json.hpp" (bare), while the system package installs | ||
| # "nlohmann/json.hpp". Point the include path at the nlohmann/ subdirectory | ||
| # so the bare include resolves. | ||
| cmake "$SOURCEDIR" \ | ||
| -DCMAKE_INSTALL_PREFIX="$INSTALLROOT" \ | ||
| -DCMAKE_BUILD_TYPE="$CMAKE_BUILD_TYPE" \ | ||
| -DCMAKE_CXX_STANDARD="${CMAKE_CXX_STANDARD:-20}" \ | ||
| -Dnlohmann_json_DIR="$NLOHMANN_JSON_ROOT/share/cmake/nlohmann_json" \ | ||
| -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ | ||
| -DBUILD_TESTS=OFF \ | ||
| -DUSE_SYSTEM_JSON=ON \ | ||
| -DBUILD_SHARED_BINARIES=ON \ | ||
| -DCMAKE_CXX_FLAGS="${CXXFLAGS:+$CXXFLAGS }-I$NLOHMANN_JSON_ROOT/include/nlohmann" | ||
|
|
||
| cmake --build . -- ${JOBS:+-j$JOBS} install | ||
|
|
||
| MODULEDIR="$INSTALLROOT/etc/modulefiles" | ||
| MODULEFILE="$MODULEDIR/$PKGNAME" | ||
| mkdir -p "$MODULEDIR" | ||
| alibuild-generate-module --bin --lib > "$MODULEFILE" |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| package: nlohmann_json | ||
| version: "%(tag_basename)s" | ||
| tag: v3.11.3 | ||
| source: https://github.com/nlohmann/json.git | ||
| prefer_system: .* | ||
| prefer_system_check: | | ||
| #!/bin/bash -e | ||
| printf '#include <nlohmann/json.hpp>\nint main(){}\n' | \ | ||
| c++ -std=c++20 -xc++ - \ | ||
| ${NLOHMANN_JSON_ROOT:+-I"$NLOHMANN_JSON_ROOT/include"} \ | ||
| -o /dev/null | ||
| build_requires: | ||
| - "GCC-Toolchain:(?!osx)" | ||
| - CMake | ||
| - alibuild-recipe-tools | ||
| --- | ||
| #!/bin/bash -e | ||
|
|
||
| cmake "$SOURCEDIR" \ | ||
| -DCMAKE_INSTALL_PREFIX="$INSTALLROOT" \ | ||
| -DCMAKE_BUILD_TYPE="$CMAKE_BUILD_TYPE" \ | ||
| -DJSON_BuildTests=OFF | ||
| cmake --build . -- ${JOBS:+-j$JOBS} install | ||
|
|
||
| MODULEDIR="$INSTALLROOT/etc/modulefiles" | ||
| MODULEFILE="$MODULEDIR/$PKGNAME" | ||
| mkdir -p "$MODULEDIR" | ||
| alibuild-generate-module > "$MODULEFILE" | ||
| cat >> "$MODULEFILE" <<EoF | ||
| # Our environment | ||
| set NLOHMANN_JSON_ROOT \$::env(BASEDIR)/$PKGNAME/\$version | ||
| prepend-path ROOT_INCLUDE_PATH \$NLOHMANN_JSON_ROOT/include | ||
| EoF |
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| @@ -0,0 +1,50 @@ | ||||||||||||||||||||||||||||||||
| package: phlex | ||||||||||||||||||||||||||||||||
| version: "%(tag_basename)s" | ||||||||||||||||||||||||||||||||
| tag: v0.1.0 | ||||||||||||||||||||||||||||||||
| source: https://github.com/Framework-R-D/phlex | ||||||||||||||||||||||||||||||||
| requires: | ||||||||||||||||||||||||||||||||
| - "GCC-Toolchain:(?!osx)" | ||||||||||||||||||||||||||||||||
| - boost | ||||||||||||||||||||||||||||||||
| - fmt | ||||||||||||||||||||||||||||||||
| - TBB | ||||||||||||||||||||||||||||||||
| - spdlog | ||||||||||||||||||||||||||||||||
| - jsonnet | ||||||||||||||||||||||||||||||||
| - ROOT | ||||||||||||||||||||||||||||||||
| build_requires: | ||||||||||||||||||||||||||||||||
| - CMake | ||||||||||||||||||||||||||||||||
| - cetmodules | ||||||||||||||||||||||||||||||||
| - alibuild-recipe-tools | ||||||||||||||||||||||||||||||||
| env: | ||||||||||||||||||||||||||||||||
| PHLEX_ROOT: "$PHLEX_ROOT" | ||||||||||||||||||||||||||||||||
| PHLEX_PLUGIN_PATH: "$PHLEX_ROOT/lib" | ||||||||||||||||||||||||||||||||
| prepend_path: | ||||||||||||||||||||||||||||||||
| ROOT_INCLUDE_PATH: "$PHLEX_ROOT/include" | ||||||||||||||||||||||||||||||||
| LD_LIBRARY_PATH: "$PHLEX_ROOT/lib" | ||||||||||||||||||||||||||||||||
| --- | ||||||||||||||||||||||||||||||||
| #!/bin/bash -e | ||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||
| # PHLEX requires C++23 regardless of defaults | ||||||||||||||||||||||||||||||||
| export CXXFLAGS="${CXXFLAGS//-std=c++*/-std=c++23}" | ||||||||||||||||||||||||||||||||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 🧩 Analysis chain🏁 Script executed: #!/bin/bash
set -euo pipefail
CXXFLAGS='-O2 -fPIC -std=c++20 -Winvalid-pch'
echo "original : $CXXFLAGS"
echo "current : ${CXXFLAGS//-std=c++*/-std=c++23}"
echo "expected : -O2 -fPIC -std=c++23 -Winvalid-pch"
echo "safer : ${CXXFLAGS//-std=c++[![:space:]]*/-std=c++23}"Repository: ShipSoft/shipdist Length of output: 216 🏁 Script executed: #!/bin/bash
set -euo pipefail
CXXFLAGS='-O2 -fPIC -std=c++20 -Winvalid-pch'
echo "original : $CXXFLAGS"
echo "current (broken) : ${CXXFLAGS//-std=c++*/-std=c++23}"
echo "proposed (also broken) : ${CXXFLAGS//-std=c++[![:space:]]*/-std=c++23}"
echo "corrected [^ ]* pattern : ${CXXFLAGS//-std=c++[^ ]*/-std=c++23}"
echo "expected : -O2 -fPIC -std=c++23 -Winvalid-pch"Repository: ShipSoft/shipdist Length of output: 373 🏁 Script executed: head -40 phlex.sh | cat -nRepository: ShipSoft/shipdist Length of output: 1351 Line 27:
The proposed character class pattern Use Corrected approach- export CXXFLAGS="${CXXFLAGS//-std=c++*/-std=c++23}"
+ export CXXFLAGS="$(sed 's/-std=c++[^ ]*/-std=c++23/g' <<< "$CXXFLAGS")"📝 Committable suggestion
Suggested change
🤖 Prompt for AI Agents |
||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||
| cmake "$SOURCEDIR" \ | ||||||||||||||||||||||||||||||||
| -DCMAKE_INSTALL_PREFIX="$INSTALLROOT" \ | ||||||||||||||||||||||||||||||||
| -DCMAKE_BUILD_TYPE="$CMAKE_BUILD_TYPE" \ | ||||||||||||||||||||||||||||||||
| -DCMAKE_CXX_STANDARD=23 \ | ||||||||||||||||||||||||||||||||
| -DCMAKE_INSTALL_LIBDIR=lib \ | ||||||||||||||||||||||||||||||||
| -DCMAKE_PREFIX_PATH="$CETMODULES_ROOT" \ | ||||||||||||||||||||||||||||||||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Setting Suggested change- -DCMAKE_PREFIX_PATH="$CETMODULES_ROOT" \
+ -DCMAKE_PREFIX_PATH="${CMAKE_PREFIX_PATH:+$CMAKE_PREFIX_PATH:}$CETMODULES_ROOT" \📝 Committable suggestion
Suggested change
🤖 Prompt for AI Agents |
||||||||||||||||||||||||||||||||
| -DPHLEX_USE_FORM=ON \ | ||||||||||||||||||||||||||||||||
| -DBUILD_TESTING=OFF \ | ||||||||||||||||||||||||||||||||
| -DENABLE_CLANG_TIDY=OFF | ||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||
| cmake --build . -- ${JOBS:+-j$JOBS} install | ||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||
| MODULEDIR="$INSTALLROOT/etc/modulefiles" | ||||||||||||||||||||||||||||||||
| MODULEFILE="$MODULEDIR/$PKGNAME" | ||||||||||||||||||||||||||||||||
| mkdir -p "$MODULEDIR" | ||||||||||||||||||||||||||||||||
| alibuild-generate-module --bin --lib > "$MODULEFILE" | ||||||||||||||||||||||||||||||||
| cat >> "$MODULEFILE" <<EoF | ||||||||||||||||||||||||||||||||
| # Our environment | ||||||||||||||||||||||||||||||||
| set PHLEX_ROOT \$::env(BASEDIR)/$PKGNAME/\$version | ||||||||||||||||||||||||||||||||
| setenv PHLEX_PLUGIN_PATH \$PHLEX_ROOT/lib | ||||||||||||||||||||||||||||||||
| prepend-path ROOT_INCLUDE_PATH \$PHLEX_ROOT/include | ||||||||||||||||||||||||||||||||
| EoF | ||||||||||||||||||||||||||||||||
|
Comment on lines
+44
to
+50
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Missing Line 47 creates a Tcl variable Proposed fix cat >> "$MODULEFILE" <<EoF
# Our environment
set PHLEX_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
+setenv PHLEX_ROOT \$PHLEX_ROOT
setenv PHLEX_PLUGIN_PATH \$PHLEX_ROOT/lib
prepend-path ROOT_INCLUDE_PATH \$PHLEX_ROOT/include
EoF📝 Committable suggestion
Suggested change
🤖 Prompt for AI Agents |
||||||||||||||||||||||||||||||||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| package: spdlog | ||
| version: "%(tag_basename)s" | ||
| tag: v1.15.2 | ||
| source: https://github.com/gabime/spdlog | ||
| requires: | ||
| - "GCC-Toolchain:(?!osx)" | ||
| - fmt | ||
| build_requires: | ||
| - CMake | ||
| - alibuild-recipe-tools | ||
| prepend_path: | ||
| ROOT_INCLUDE_PATH: "$SPDLOG_ROOT/include" | ||
| --- | ||
| #!/bin/bash -e | ||
|
|
||
| cmake "$SOURCEDIR" \ | ||
| -DCMAKE_INSTALL_PREFIX="$INSTALLROOT" \ | ||
| -DCMAKE_BUILD_TYPE="$CMAKE_BUILD_TYPE" \ | ||
| -DCMAKE_PREFIX_PATH="$FMT_ROOT" \ | ||
| -DSPDLOG_FMT_EXTERNAL=ON \ | ||
| -DSPDLOG_BUILD_SHARED=ON \ | ||
| -DSPDLOG_BUILD_EXAMPLE=OFF \ | ||
| -DSPDLOG_BUILD_TESTS=OFF | ||
|
|
||
| cmake --build . -- ${JOBS:+-j$JOBS} install | ||
|
|
||
| MODULEDIR="$INSTALLROOT/etc/modulefiles" | ||
| MODULEFILE="$MODULEDIR/$PKGNAME" | ||
| mkdir -p "$MODULEDIR" | ||
| alibuild-generate-module --lib > "$MODULEFILE" | ||
| cat >> "$MODULEFILE" <<EoF | ||
| # Our environment | ||
| set SPDLOG_ROOT \$::env(BASEDIR)/$PKGNAME/\$version | ||
| setenv SPDLOG_ROOT \$SPDLOG_ROOT | ||
| prepend-path LD_LIBRARY_PATH \$SPDLOG_ROOT/lib | ||
| prepend-path ROOT_INCLUDE_PATH \$SPDLOG_ROOT/include | ||
| EoF |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,13 +8,10 @@ env: | |
| XERCESC_INST_DIR: "$XERCESC_ROOT" | ||
| XERCESCINST: "$XERCESC_ROOT" | ||
| XERCESCROOT: "$XERCESC_ROOT" | ||
| prefer_system: .* | ||
| prefer_system_check: | | ||
| #!/bin/bash -e | ||
| ls $XERCESC_ROOT/ > /dev/null && \ | ||
| ls $XERCESC_ROOT/bin > /dev/null && \ | ||
| ls $XERCESC_ROOT/include > /dev/null && \ | ||
| ls $XERCESC_ROOT/include/xercesc/ > /dev/null && \ | ||
| ls $XERCESC_ROOT/lib > /dev/null && \ | ||
| ls $XERCESC_ROOT/lib/libxerces-c.so > /dev/null | ||
|
Comment on lines
+11
to
15
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Handle the macOS library name in the system probe. With Possible fix prefer_system_check: |
#!/bin/bash -e
- ls $XERCESC_ROOT/include/xercesc/ > /dev/null && \
- ls $XERCESC_ROOT/lib/libxerces-c.so > /dev/null
+ test -d "$XERCESC_ROOT/include/xercesc" && \
+ case $ARCHITECTURE in
+ osx*) test -f "$XERCESC_ROOT/lib/libxerces-c.dylib" ;;
+ *) test -f "$XERCESC_ROOT/lib/libxerces-c.so" ;;
+ esac🤖 Prompt for AI Agents |
||
| --- | ||
| #!/bin/sh | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Add the standard shebang to this shell probe.
alidistlintalready flags Lines 5-9 because the block does not start with#!/bin/bash -e. Adding it keeps this probe consistent with the other new shell checks in this PR and avoids spurious lint noise.Suggested fix
prefer_system_check: | + #!/bin/bash -e printf '#include <Eigen/Dense>\nint main(){}\n' | \📝 Committable suggestion
🧰 Tools
🪛 GitHub Check: alidistlint
[notice] 6-6:
Missing script shebang. Use exactly "#!/bin/bash -e" to match aliBuild environment. You may see spurious errors until you fix the shebang. [ali:bad-shebang]
🪛 Shellcheck (0.11.0)
[warning] 6-6: Piping to 'printf', a command that doesn't read stdin. Wrong command or missing xargs?
(SC2216)
🤖 Prompt for AI Agents