[WIP] Update and standardize implementation of packages, in sync with spack update #480

adrienbernede · 2024-09-25T10:35:08Z

Summary

This PR :

migrates CARE and Caliper to CachedCMakePackage, reducing the gap with implementations found in llnl/radiuss-spack-configs.
improves coherency in version constraints across RADIUSS packages.
updates Spack.
updates RAJA to latest develop.
NOTE: This PR contains changes to kernels with reductions to update to the new val-op interface which is needed to build with RAJA develop.

👀 Deserves some consideration:

The spec added in CI for sycl on corona had +openmp. I had to turn openmp support off due to a build error. Openmp support is turned off for the same job in RAJA CI. Then I had to turn benchmarks off. Now it's something else. Allowing the job to fail for now.

⚠️ TODO Before Merge:

Fix failing tests in intel jobs on ruby and poodle.
Wait for merge of Update and standardize implementation of RADIUSS packages spack/spack#45648,
then wait for subsequent develop snapshot (Sunday).
Update Spack to new snapshot version in .uberenv-config.json.
Confirm CI is passing.

…17 logic

rhornung67 · 2024-09-27T17:19:01Z

@adrienbernede I don't understand why SYCL CI is failing. I can build and run the tests manually on corona using the scripts/lc-builds/corona_sycl.sh script. Please note that I fixed a couple of issues in this PR: #481. Those changes were necessary for me to build and run successfully.

The build script mentioned here may be helpful for you to get the CI SYCL build correct.

rhornung67 · 2024-09-27T17:19:34Z

Also, OpenMP can be enabled for the SYCL checks.

adrienbernede · 2024-09-30T10:08:59Z

@rhornung67
I had turned off OpenMP because of this:

CMake Error at /usr/tce/backend/installations/linux-rhel8-x86_64/gcc-10.3.1/cmake-3.23.1-mdfqd2l7c33zg7xcvqizwz25vqmp7jfw/share/cmake-3.23/Modules/FindPackageHandleStandardArgs.cmake:230 (message):
  Could NOT find OpenMP_C (missing: OpenMP_C_FLAGS OpenMP_C_LIB_NAMES)
Call Stack (most recent call first):
  /usr/tce/backend/installations/linux-rhel8-x86_64/gcc-10.3.1/cmake-3.23.1-mdfqd2l7c33zg7xcvqizwz25vqmp7jfw/share/cmake-3.23/Modules/FindPackageHandleStandardArgs.cmake:594 (_FPHSA_FAILURE_MESSAGE)
  /usr/tce/backend/installations/linux-rhel8-x86_64/gcc-10.3.1/cmake-3.23.1-mdfqd2l7c33zg7xcvqizwz25vqmp7jfw/share/cmake-3.23/Modules/FindOpenMP.cmake:545 (find_package_handle_standard_args)
  blt/cmake/thirdparty/BLTSetupOpenMP.cmake:11 (find_package)
  blt/cmake/BLTSetupTargets.cmake:86 (include)
  blt/cmake/SetupThirdParty.cmake:6 (include)
  blt/SetupBLT.cmake:129 (include)
  CMakeLists.txt:28 (include)

I'll try with your fix.

…rface

Issue needs to be fixed

…optim/spack-update

… sycl test

rhornung67 · 2024-10-24T18:02:09Z

@adrienbernede I pushed a change to the raja-perf spack package that may fix the SYCL CI issue. If this works, we will need to merge a sequence of PRs, in order: first pull radiuss-spack-configs branch with Spack package change, second pull updated radiuss-spack-configs main into RAJA develop, third pull new RAJA develop into this PR branch. Then, we should be able to merge this (fingers crossed).

rhornung67 · 2024-10-28T20:50:05Z

@adrienbernede I found and fixed the issue. See this commit: 01bf5b2

rhornung67 · 2024-10-30T16:17:46Z

@rchen20 @MrBurmark This will be merged soon after a couple of other PRs are merged on other projects so that this can point at develop/main branches of RAJA and radiuss-spack-configs. To do these updates, we pulled the reduction kernels changes to the new val-op interface into this PR. Please review those changes in this PR before this is merged. Thank you.

rchen20 · 2024-10-31T17:04:31Z

src/lcals/FIRST_MIN-Cuda.cpp

+      RAJA::expt::ValLoc<Real_type, RAJA::Index_type> tminloc(m_xmin_init,
+                                                              m_initloc);

       RAJA::forall<exec_policy>( res,
         RAJA::RangeSegment(ibegin, iend),
-         RAJA::expt::Reduce<RAJA::operators::minimum>(&tloc),
-         [=] __device__ (Index_type i, VL_TYPE& loc) {
-           loc.min(x[i], i);
+         RAJA::expt::Reduce<RAJA::operators::minimum>(&tminloc),
+         [=] __device__ (Index_type i,
+           RAJA::expt::ValLocOp<Real_type, Index_type,


The ValLocOp Index_type should match the above ValLoc's RAJA::Index_type. I can't quite tell if they match, but we should check. It's probably working due to type erasure in the internals.

Good catch -- thanks!. That's a cut-and-paste error. The types are the same and the types in RAJAPerf are aliases to the RAJA types. I pushed a change plus some others for code consistency.

rchen20 · 2024-10-31T17:07:13Z

src/lcals/FIRST_MIN-Sycl.cpp

-           loc.min(x[i], i);
+         RAJA::expt::Reduce<RAJA::operators::minimum>(&tminloc),
+         [=]  (Index_type i,
+           RAJA::expt::ValLocOp<Real_type, Index_type,


Should check matching Index_type here too.

rchen20 · 2024-10-31T17:07:23Z

src/lcals/FIRST_MIN-Seq.cpp

-              loc.min(x[i], i);
+            RAJA::expt::Reduce<RAJA::operators::minimum>(&tminloc),
+            [=](Index_type i,
+              RAJA::expt::ValLocOp<Real_type, Index_type,


Should check matching Index_type here too.

rchen20

LGTM

and fix merge conflicts

rhornung67 · 2024-10-31T19:58:24Z

@adrienbernede This PR is synced up with latest radiuss-spack-configs main and RAJA develop. All checks passed. You may have the honor of merging.

rhornung67 and others added 16 commits August 30, 2024 15:23

Update GitLab CI content to match Adrien's RAJA PR

fad8028

Update files used in GitLab CI

1c96029

Update RAJA

1e1535c

Update lassen jobs w.r.t. changes in radiuss-spack-configs

5676a48

Merge branch 'develop' into task/rhornung67/update-ci-toolchains

5896fc5

Update and standardize RADIUSS packages

ea7a9de

build_and_test.sh: allow to control whether or not to push to registry

5d0fcd1

From RAJA: Update RSC with fixes

77cf546

Fix package name

3ee1f8f

Update RAJA

99dd23d

Fix Spack branch name

6a82d52

From RAJA: From RSC: Add missing sycl variant to RAJAPerf and fix c++…

c06f8c8

…17 logic

Fix tests variant value in sycl spec

f7653e1

Turn off openmp support in sycl job on corona (same as RAJA CI)

a27dcfe

turn off benchmarks

e3267f7

Allow failure of sycl job on corona for now

aae34ed

adrienbernede mentioned this pull request Sep 26, 2024

Update GitLab CI content to match Adrien's RAJA PR #477

Closed

Merge branch 'develop' into woptim/spack-update

9caaef0

adrienbernede and others added 9 commits October 1, 2024 11:03

From RAJA: From RSC: RAJAPerf: Fix CMake variable for sycl support

98e70e4

Update Spack ref (waiting for next snapshot tag)

83e4124

Update RSC to main

b379712

From RAJA: Update RAJA and Update RSC to main

460a946

Update Spack to appropriate snapshot branch

d124c33

Merge branch 'develop' into woptim/spack-update

173bb92

Update to RAJA develop and convert Seq and OMP reductions to new inte…

dcce169

…rface

Update RAJA to merge of similar PR

7505865

Convert CUDA variants to new reduction interface

7696a9f

rhornung67 and others added 5 commits October 23, 2024 08:40

Update to RAJA develop

67462ee

Merge branch 'woptim/spack-update' of github.com:LLNL/RAJAPerf into w…

f478a84

…optim/spack-update

Try to get more info about corona SYCL job

c6abab1

Fix test variant syntax

4bb3f45

Pull in RAJA branch with radiuss-spack-configs branch that should fix…

ab7d71b

… sycl test

rhornung67 and others added 5 commits October 24, 2024 11:35

SYCL CI fix attempt

bb596d5

Apply changes to second occurence of ENABLE_SYCL

28e585a

Pull in latest RAJA and don't allow jobs to fail

afddcb8

From RAJA: From RSC: Set both ENABLE_SYCL and RAJA_ENABLE_SYCL

e1c42e6

Don't unload rocm module on corona

01bf5b2

Pull in new radiuss-spack-configs via RAJA

58ff1da

rhornung67 mentioned this pull request Oct 29, 2024

Bugfix/rhornung67/fix sycl LLNL/radiuss-spack-configs#112

Merged

Update some specs and remove allow failure

314f510

adayton1 changed the title ~~[WIP] Update and sandardize implementation of packages, in sync with spack update~~ [WIP] Update and standardize implementation of packages, in sync with spack update Oct 29, 2024

rhornung67 requested a review from rchen20 October 30, 2024 16:15

rchen20 reviewed Oct 31, 2024

View reviewed changes

Type and code consistency

89f1618

rchen20 approved these changes Oct 31, 2024

View reviewed changes

rhornung67 added 2 commits October 31, 2024 12:54

Merge branch 'develop' into woptim/spack-update

0c61dd7

and fix merge conflicts

Update to latest RAJA develop

b54d8f7

rhornung67 approved these changes Oct 31, 2024

View reviewed changes

adrienbernede merged commit 964e21b into develop Nov 4, 2024
40 checks passed

adrienbernede deleted the woptim/spack-update branch November 4, 2024 13:55

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[WIP] Update and standardize implementation of packages, in sync with spack update #480

[WIP] Update and standardize implementation of packages, in sync with spack update #480

adrienbernede commented Sep 25, 2024 •

edited by rhornung67

Loading

rhornung67 commented Sep 27, 2024

rhornung67 commented Sep 27, 2024

adrienbernede commented Sep 30, 2024

rhornung67 commented Oct 24, 2024

rhornung67 commented Oct 28, 2024

rhornung67 commented Oct 30, 2024

rchen20 Oct 31, 2024

rhornung67 Oct 31, 2024

rchen20 Oct 31, 2024

rhornung67 Oct 31, 2024

rchen20 Oct 31, 2024

rhornung67 Oct 31, 2024

rchen20 left a comment

rhornung67 commented Oct 31, 2024 •

edited

Loading

[WIP] Update and standardize implementation of packages, in sync with spack update #480

[WIP] Update and standardize implementation of packages, in sync with spack update #480

Conversation

adrienbernede commented Sep 25, 2024 • edited by rhornung67 Loading

Summary

rhornung67 commented Sep 27, 2024

rhornung67 commented Sep 27, 2024

adrienbernede commented Sep 30, 2024

rhornung67 commented Oct 24, 2024

rhornung67 commented Oct 28, 2024

rhornung67 commented Oct 30, 2024

rchen20 Oct 31, 2024

Choose a reason for hiding this comment

rhornung67 Oct 31, 2024

Choose a reason for hiding this comment

rchen20 Oct 31, 2024

Choose a reason for hiding this comment

rhornung67 Oct 31, 2024

Choose a reason for hiding this comment

rchen20 Oct 31, 2024

Choose a reason for hiding this comment

rhornung67 Oct 31, 2024

Choose a reason for hiding this comment

rchen20 left a comment

Choose a reason for hiding this comment

rhornung67 commented Oct 31, 2024 • edited Loading

adrienbernede commented Sep 25, 2024 •

edited by rhornung67

Loading

rhornung67 commented Oct 31, 2024 •

edited

Loading