Skip to content

Commit

Permalink
Merge branch 'main' into cdp-repo-cleanup
Browse files Browse the repository at this point in the history
- LAMMPS - Contributing Open PR - Delete from repo afterwards
- Kokkos - Contributing Open PR - Delete from repo afterwards
- LLVM: delete from repo, and check if spack recipe works with newer spack.
- PLUMED: try newer recipe from newer spack, otherwise explain why we need `plumed_patch("-p", "-e", target, "-f")   `
-py-mpi4py: try newer recipe from newer spack, otherwise explain why ` env.set('MPICC', f"{self.spec['mpi'].mpicc} -shared")` (the `-shared` option.)
  • Loading branch information
dipietrantonio committed Aug 21, 2024
2 parents 9fe700c + ba2bb2d commit cdcbce6
Show file tree
Hide file tree
Showing 247 changed files with 17,502 additions and 8,167 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@ logs/
*.tar.gz
*.tar.bz2
patch*
slurm-*
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ This is where system specific configurations are placed. In particular, the foll

* `configs/` is a directory containing `yaml` configuraiton files for Spack. There are three types of configuration:
* `site/`: Spack configuration files that are valid for all users, which will sit in `$spack/etc/spack`.
* `project/`: Spack configuration files that are valid for project-wide installations executed by any user using the dedicated script `spack_project.sh`.
* `spackuser/`: Spack configuration files for system-wide installs, performed by Pawsey staff, which will sit in `/home/spack/.spack/`, allowing the `spack` user to override system-wide settings.
* `project/`: Spack configuration files that are valid for project-wide installations executed by any user using the custom Spack command `spack project [...]`.
* `spackuser/`: Spack configuration files for system-wide installation, performed by Pawsey staff using the `spack` linux user, allowing to override the `site` settings.
* `environments/`: Spack environments to be deployed.
* `templates/`: modulefile templates for Spack.

Expand Down
2 changes: 1 addition & 1 deletion fixes/modulenames_plus_common.patch
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ index eaf79f6d04..1be017f46e 100644
@@ -614,8 +616,9 @@ def use_name(self):
projection = self.conf.default_projections["all"]

name = self.spec.format(projection)
name = self.spec.format_path(projection)
- # Not everybody is working on linux...
- parts = name.split("/")
+ # Not everybody is working on linux... so split on /
Expand Down
Loading

0 comments on commit cdcbce6

Please sign in to comment.