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

[Woptim] Update Shared CI and Spack Configs #255

Closed
wants to merge 8 commits into from
Closed

[Woptim] Update Shared CI and Spack Configs #255

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3258267
Update Shared CI with reproducer fix
adrienbernede Apr 15, 2024
0609995
Update Spack Configs
adrienbernede Apr 15, 2024
dc2c165
Use new pci queue on tioga
adrienbernede Apr 16, 2024
f91db7a
Apply changes required by LC (token handling)
adrienbernede Apr 17, 2024
d1bd65f
Merge branch 'develop' into woptim/spack-envs
adayton1 Apr 30, 2024
f8cdc01
Restore settings for local packages repo
adrienbernede Jun 4, 2024
168819d
Merge branch 'develop' into woptim/spack-envs
adrienbernede Jun 4, 2024
01fbd61
Add missing directory for Spack
adrienbernede Jun 4, 2024
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
6 changes: 4 additions & 2 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ stages:
include:
- local: '.gitlab/custom-jobs-and-variables.yml'
- project: 'radiuss/radiuss-shared-ci'
ref: 'v2023.12.0'
ref: 'v2024.04.0'
file: 'pipelines/${CI_MACHINE}.yml'
- artifact: '${CI_MACHINE}-jobs.yml'
job: 'generate-job-lists'
Expand All @@ -82,9 +82,11 @@ stages:
pipeline_variables: true

include:
- project: 'lc-templates/id_tokens'
file: 'id_tokens.yml'
# [Optional] checks preliminary to running the actual CI test
#- project: 'radiuss/radiuss-shared-ci'
# ref: 'v2023.12.0'
# ref: 'v2024.04.0'
# file: 'utilities/preliminary-ignore-draft-pr.yml'
# pipelines subscribed by the project
- local: '.gitlab/subscribed-pipelines.yml'
2 changes: 1 addition & 1 deletion .gitlab/custom-jobs-and-variables.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ variables:

# Tioga
# Arguments for top level allocation
TIOGA_SHARED_ALLOC: "--exclusive --time-limit=20m --nodes=1"
TIOGA_SHARED_ALLOC: "--queue=pci --exclusive --time-limit=20m --nodes=1"
# Arguments for job level allocation
TIOGA_JOB_ALLOC: "--nodes=1 --begin-time=+5s"
# Project specific variants for tioga
Expand Down
3 changes: 2 additions & 1 deletion .gitlab/jobs/corona.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
##############################################################################

# Override reproducer section to define project specific variables.
.corona_reproducer_vars: &corona_reproducer_vars
.corona_reproducer_vars:
script:
- |
echo -e "export MODULE_LIST=\"${MODULE_LIST}\""
echo -e "export SPEC=\"${SPEC//\"/\\\"}\""
Expand Down
3 changes: 2 additions & 1 deletion .gitlab/jobs/lassen.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
##############################################################################

# Override reproducer section to define project specific variables.
.lassen_reproducer_vars: &lassen_reproducer_vars
.lassen_reproducer_vars:
script:
- |
echo -e "export MODULE_LIST=\"${MODULE_LIST}\""
echo -e "export SPEC=\"${SPEC//\"/\\\"}\""
Expand Down
3 changes: 2 additions & 1 deletion .gitlab/jobs/poodle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
###############################################################################

# Override reproducer section to define projet specific variables.
.poodle_reproducer_vars: &poodle_reproducer_vars
.poodle_reproducer_vars:
script:
- |
echo -e "export MODULE_LIST=\"${MODULE_LIST}\""
echo -e "export SPEC=\"${SPEC//\"/\\\"}\""
Expand Down
3 changes: 2 additions & 1 deletion .gitlab/jobs/ruby.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
###############################################################################

# Override reproducer section to define projet specific variables.
.poodle_reproducer_vars: &poodle_reproducer_vars
.poodle_reproducer_vars:
script:
- |
echo -e "export MODULE_LIST=\"${MODULE_LIST}\""
echo -e "export SPEC=\"${SPEC//\"/\\\"}\""
Expand Down
3 changes: 2 additions & 1 deletion .gitlab/jobs/tioga.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
##############################################################################

# Override reproducer section to define project specific variables.
.tioga_reproducer_vars: &tioga_reproducer_vars
.tioga_reproducer_vars:
script:
- |
echo -e "export MODULE_LIST=\"${MODULE_LIST}\""
echo -e "export SPEC=\"${SPEC//\"/\\\"}\""
Expand Down
4 changes: 2 additions & 2 deletions .uberenv_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
"package_final_phase": "initconfig",
"package_source_dir": "../..",
"spack_url": "https://github.com/spack/spack.git",
"spack_branch": "develop-2024-01-21",
"spack_branch": "develop-2024-02-18",
"spack_activate": {},
"spack_configs_path": "scripts/radiuss-spack-configs",
"spack_packages_path": ["scripts/radiuss-spack-configs/packages", "scripts/spack_packages/packages"],
Copy link
Member

Choose a reason for hiding this comment

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

I'd rather have this machinery left in.

Copy link
Member Author

Choose a reason for hiding this comment

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

Done!

"spack_packages_path": "scripts/radiuss-spack-configs/packages",
"spack_concretizer": "clingo",
"spack_setup_clingo": false,
"debug": true
Expand Down
2 changes: 1 addition & 1 deletion scripts/radiuss-spack-configs
Open in desktop
Submodule radiuss-spack-configs updated 35 files
+4 −3 README.md
+0 −586 blueos_3_ppc64le_ib/compilers.yaml
+0 −99 blueos_3_ppc64le_ib/packages.yaml
+761 −0 blueos_3_ppc64le_ib/spack.yaml
+0 −242 config.yaml
+0 −93 darwin/compilers.yaml
+0 −25 darwin/packages.yaml
+131 −0 darwin/spack.yaml
+11 −2 docs/sphinx/user_guide/use_spack.rst
+1 −1 gitlab/radiuss-jobs/corona.yml
+6 −5 gitlab/radiuss-jobs/lassen.yml
+4 −4 gitlab/radiuss-jobs/poodle.yml
+4 −4 gitlab/radiuss-jobs/ruby.yml
+2 −2 gitlab/radiuss-jobs/tioga.yml
+49 −0 packages/blt/package.py
+41 −14 packages/caliper/package.py
+24 −0 packages/camp/libstdc++-13-missing-header.patch
+55 −124 packages/camp/package.py
+244 −0 packages/care/package.py
+13 −0 packages/chai/change_mpi_target_name_umpire_patch.patch
+22 −25 packages/chai/package.py
+2 −1 packages/fmt/package.py
+204 −67 packages/raja/package.py
+10 −7 packages/raja_perf/package.py
+106 −0 packages/umpire/dual_blt_import_umpire_2022.10_2023.06.patch
+216 −111 packages/umpire/package.py
+0 −560 toss_3_x86_64_ib/compilers.yaml
+0 −139 toss_3_x86_64_ib/packages.yaml
+728 −0 toss_3_x86_64_ib/spack.yaml
+0 −302 toss_4_x86_64_ib/compilers.yaml
+0 −212 toss_4_x86_64_ib/packages.yaml
+543 −0 toss_4_x86_64_ib/spack.yaml
+0 −248 toss_4_x86_64_ib_cray/compilers.yaml
+0 −193 toss_4_x86_64_ib_cray/packages.yaml
+470 −0 toss_4_x86_64_ib_cray/spack.yaml
239 changes: 0 additions & 239 deletions scripts/spack_packages/packages/care/package.py
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions scripts/spack_packages/repo.yaml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion scripts/uberenv
Open in desktop
Submodule uberenv updated 24 files
+1 −1 .ci/test-project/README.md
+1 −1 .ci/test-project/packages/magictestlib/package.py
+1 −1 .ci/test-project/packages/magictestlib_cached/package.py
+1 −1 .ci/test-project/packages/uberenv-magictestlib/package.py
+2 −0 .ci/test-project/repo.yaml
+0 −0 .ci/test-project/spack_configs/compilers.yaml
+19 −0 .ci/test-project/spack_configs/darwin/spack.yaml
+20 −0 .ci/test-project/spack_configs/linux_ubuntu_22/spack.yaml
+0 −6 .ci/test-project/spack_configs/packages.yaml
+33 −0 .ci/test-project/spack_configs/toss_4_x86_64_ib/spack.yaml
+0 −0 .ci/test-project/uberenv_configs/dev-build.json
+1 −0 .ci/test-project/uberenv_configs/install.json
+0 −0 .ci/test-project/uberenv_configs/uberenv-pkg.json
+23 −10 .github/workflows/linux.yml
+1 −1 .github/workflows/macos.yml
+1 −1 .gitlab-ci.yml
+24 −0 .readthedocs.yml
+1 −1 LICENSE
+1,329 −0 deprecated_uberenv.py
+3 −0 docs/requirements.txt
+2 −2 docs/sphinx/conf.py
+74 −39 docs/sphinx/index.rst
+1 −1 gen_spack_env_script.py
+411 −363 uberenv.py
Loading