Skip to content

Clean up CMake in CHAI #247

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

Jump to bottom
Merged
adayton1 merged 7 commits into from
Feb 19, 2024
Merged

Clean up CMake in CHAI #247

adayton1 merged 7 commits into from
Feb 19, 2024

Conversation

@adayton1
Copy link
Member

@adayton1 adayton1 commented Feb 16, 2024 •
edited
Loading

  • Improve dependency handling (use existing CMake targets instead of blt_register_library)
  • Revamp installed CMake config
  • Install chai-config.cmake to lib/cmake/chai instead of share/chai/cmake (to be consistent with other libraries)

rhornung67
rhornung67 previously approved these changes Feb 16, 2024
View reviewed changes
rhornung67
rhornung67 previously approved these changes Feb 16, 2024
View reviewed changes
rhornung67
rhornung67 reviewed Feb 16, 2024
View reviewed changes
cmake/chai-config.cmake.in Outdated
@@ -0,0 +1,31 @@
##############################################################################
# Copyright (c) 2016-20, Lawrence Livermore National Security, LLC and CHAI
Copy link
Member

@rhornung67 rhornung67 Feb 16, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Do you folks update the copyright dates at the beginning of each new year? There is a script in RAJA/scripts directory for doing this throughout the code. You probably have to tweak it to work with CHAI project.

Copy link
Member Author

@adayton1 adayton1 Feb 16, 2024

Choose a reason for hiding this comment

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

I can take a look at the script in RAJA.

Copy link
Member

@rhornung67 rhornung67 Feb 16, 2024

Choose a reason for hiding this comment

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

It's pretty manual, but straightforward. If you have any questions please let me know. Depending on how inconsistent the dates are in the files it may require running it over the code multiple times with different sed options.

Copy link
Member Author

@adayton1 adayton1 Feb 17, 2024

Choose a reason for hiding this comment

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

#248

rhornung67
rhornung67 approved these changes Feb 16, 2024
View reviewed changes
Copy link
Member

@rhornung67 rhornung67 left a comment

Choose a reason for hiding this comment

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

Question about copyright dates in files.

@adayton1 adayton1 merged commit a6facd0 into develop Feb 19, 2024
@adayton1 adayton1 deleted the feature/dayton8/cmake branch February 19, 2024 19:03
adayton1 added a commit that referenced this pull request Mar 5, 2024
@adayton1 @davidbeckingsale
@liu15 @kab163 @artv3 @robinson96 @adrienbernede
V2024.02.0 RC (#252)
31773a2 
* Depend on develop version of TPLs

* Tweak version constraints

* Update Umpire package

* Fix syntax error in Umpire package

* Update packages for CHAI and Umpire

* Depend on newer camp

* Update versions for RAJA and Umpire

* Fixes for libcpp builds

* Add SLURM_OVERLAP variable

* Add greater control for when CHAI is a submodule

* Fix hip build with resource manager disabled

* Depend on camp@main

* Missed one reference to camp@master

* Bug fixes for HIP and managed_ptr

* Clean up managed_ptr.hpp

* Fix host build warning

* Customize block size for HIP build

* Add a managed_ptr example

* Fix HIP kernel launches

* Add reproducer for HIP managed_ptr errors

* Clean up managed_ptr reproducer

* Add a simpler reproducer

* Add simplest reproducer

* Fix macro

* Fix mutex lock in evict() that overlaps with lock in free()

* initial changes to add CHAI_ cmake prefix

* fixing cmake option command syntax

* trying to fix azure pipeline image and raja plugin flag

* make edits to azure pipeline file

* Switching from quartz to ruby in gitlab CI

* Updating umpire camp dependency

* Release v2022.03.0 (#208)

* Update Spack packages for CI (#210)

* Add CHAI + RAJA launch integration test. (#219)

* Release v2022.10.0 (#217)

* Make operator overloads bind in more cases (#222)

* MigrateInner on CHAI Copyable for PINNED / UM (#223)

* Use shared CI (#213)

* Deprecate API for synchronization after device kernels (#228)

* setExecutionSpace thread safety(#230)


Co-authored-by: Neela Kausik <kausik1@llnl.gov>

* Release v2023.06.0 (#232)

* [Woptim] Update shared ci to v2023.08.0 (#236)

* Remove explicit device synchronization (#235)

* Update radiuss-shared-ci to new release (with radiuss-spack-configs) (#238)

* Use free instead of realloc to zero size (#239)

* [Woptim] shared ci 2023.12.0 (#241)

* Update Shared CI and Spack Configs to add poodle

* Activate poodle subpipeline

* Reduce allocated time

* Fine tune allocation duration

* Fine tune allocation duration in CI

* Comment alloc command choices

* Update RSC to main

* Fix missing poodle alloc info, update to radiuss Shared CI 2023.12.0, sync build_and_test script with RAJA

* Update radiuss-spack-configs

* CI updates (#244)

* Updates radiuss-spack-configs to commit a37c3e1
* Changes to match the CI of other projects

* Support for a single memory space writeable by both GPU and CPU (#242)

* Support for a single memory space writeable by both GPU and CPU. Provides appropriate synchronizations when needed instead of performing any memory copies.

---------

Co-authored-by: Alan Dayton <dayton8@llnl.gov>

* Clean up CHAI dependency handling

* Revert "Clean up CHAI dependency handling"

This reverts commit 5afb66a.

* Clean up CMake in CHAI (#247)

* Update copyright to 2024 (#248)

* Update to BLT v0.6.1 (#243)

* Update to BLT v0.6.1
* Update to RAJA v2024.02.0
* Update to Umpire 2024.02.0
* Use new way of exporting tpls
* Disable failing container builds since container images are being revamped
* Allow failure for the job using libcpp - doesn't play nicely with fmt at the moment
* Use branch of radiuss-spack-configs to fix spack builds
* Add install tests
* Add a file with release notes
* Ignoring runner issues on tioga since the jobs passed previously

* [Woptim] update spack + update to rocm 5.7.1 (#245)

* Update Spack version
* Update RADIUSS Spack Configs with February 2024 release changes

---------

Co-authored-by: Alan Dayton <dayton8@llnl.gov>

* Update version numbers

---------

Co-authored-by: David Beckingsale <davidbeckingsale@gmail.com>
Co-authored-by: Benjamin T. Liu <liu15@llnl.gov>
Co-authored-by: Kristi <belcher6@rzansel61.coral.llnl.gov>
Co-authored-by: Kristi <belcher6@llnl.gov>
Co-authored-by: Arturo Vargas <artvar3@yahoo.com>
Co-authored-by: robinson96 <robinson96@llnl.gov>
Co-authored-by: Adrien Bernede <51493078+adrienbernede@users.noreply.github.com>
Co-authored-by: Neela Kausik <kausik1@llnl.gov>
Co-authored-by: Ben Liu <38140930+liu15@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rhornung67 rhornung67 rhornung67 approved these changes

@liu15 liu15 liu15 approved these changes

@davidbeckingsale davidbeckingsale Awaiting requested review from davidbeckingsale

@adrienbernede adrienbernede Awaiting requested review from adrienbernede

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@adayton1 @rhornung67 @liu15