From 5910d292b310d77dd24fae824714e7a8423d3717 Mon Sep 17 00:00:00 2001 From: Mike Owen Date: Wed, 18 Oct 2023 16:36:05 -0700 Subject: [PATCH 1/4] Correcting release number --- License.txt | 2 +- README.md | 2 +- docs/intro/introduction.rst.inc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/License.txt b/License.txt index 0e9354d62..eb98d7d91 100644 --- a/License.txt +++ b/License.txt @@ -1,7 +1,7 @@ Copyright (c) 2012, Lawrence Livermore National Security, LLC. Produced at the Lawrence Livermore National Laboratory Written by J. Michael Owen -CODE-OCEC-12-049 +LLNL-CODE-561852 All rights reserved. The files in this directory and below are part of Spheral++. For details, see diff --git a/README.md b/README.md index c24b12926..de34ecd1d 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ Release and license: Copyright (c) 2012, Lawrence Livermore National Security, LLC. Produced at the Lawrence Livermore National Laboratory Written by J. Michael Owen -CODE-OCEC-12-049 +LLNL-CODE-561852 All rights reserved. Please see full license at https://github.com/jmikeowen/spheral/blob/master/License.txt diff --git a/docs/intro/introduction.rst.inc b/docs/intro/introduction.rst.inc index eb7bab912..1de8df747 100644 --- a/docs/intro/introduction.rst.inc +++ b/docs/intro/introduction.rst.inc @@ -28,7 +28,7 @@ Release and License: Copyright (c) 2012, Lawrence Livermore National Security, LLC. Produced at the Lawrence Livermore National Laboratory Written by J. Michael Owen mikeowen@llnl.gov -CODE-OCEC-12-049 +LLNL-CODE-561852 All rights reserved. Please see `full license `_ From 0fed2e496b55cf65cd1e96c8c61877fcd7c38d07 Mon Sep 17 00:00:00 2001 From: mdavis36 Date: Mon, 23 Oct 2023 15:34:00 -0700 Subject: [PATCH 2/4] updating genie filesystem. --- scripts/lc/lcats | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/lc/lcats b/scripts/lc/lcats index e760437e5..5ae63bd1f 100755 --- a/scripts/lc/lcats +++ b/scripts/lc/lcats @@ -741,11 +741,14 @@ def getUniqueTestPath(): for name in ['jade', 'agate', 'mica', 'magma', 'ruby']: filesystems[name] = ['/p/lustre2', '/p/lustre1'] + for name in ['rzgenie']: + filesystems[name] = ['/p/lustre1'] + for name in ['sierra', 'tron']: filesystems[name] = [ '/p/gpfs1' ] # RZ LLNL machines - for name in ['rzalastor', 'rzcereal', 'rzzeus', 'rzmerl', 'rzgenie', 'rztopaz']: + for name in ['rzalastor', 'rzcereal', 'rzzeus', 'rzmerl', 'rztopaz']: filesystems[name] = [ '/p/lscratchrza' ] for name in ['rzansel', 'lassen']: From d8bcbbf65c4860faf8d96c6fed7671d3999ef6b8 Mon Sep 17 00:00:00 2001 From: mdavis36 Date: Tue, 24 Oct 2023 11:44:36 -0700 Subject: [PATCH 3/4] Move CI clone directory up one; build spack TPLs adjacent to repo. --- .gitlab/scripts.yml | 2 +- scripts/gitlab/build_and_install.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab/scripts.yml b/.gitlab/scripts.yml index bf9763b5d..069bfaf6a 100644 --- a/.gitlab/scripts.yml +++ b/.gitlab/scripts.yml @@ -5,7 +5,7 @@ .build: stage: build_and_install script: - - CI_BUILD_DIR=$SPHERAL_BUILDS_DIR/$CI_JOB_ID + - CI_BUILD_DIR=$SPHERAL_BUILDS_DIR/$CI_JOB_ID/project - echo $CI_BUILD_DIR &> ci-dir.txt && echo $CI_JOB_NAME &> job-name.txt - echo $CI_BUILD_DIR && echo $CI_PROJECT_DIR - mkdir -p $CI_BUILD_DIR && cp -a $CI_PROJECT_DIR/. $CI_BUILD_DIR diff --git a/scripts/gitlab/build_and_install.py b/scripts/gitlab/build_and_install.py index 38da211d1..150caf5b3 100755 --- a/scripts/gitlab/build_and_install.py +++ b/scripts/gitlab/build_and_install.py @@ -65,7 +65,8 @@ def main(): # Build out our TPLs for this spec if we need to. if not args.build_only: print("** Building spec TPLs : {0}".format(args.spec)) - sexe("{0} --spheral-spack-dir spheral-spack-tpls --spec=\"{1}\"".format(tpl_manager_cmd, args.spec)) + sexe("{0} --spec=\"{1}\"".format(tpl_manager_cmd, args.spec)) + #sexe("{0} --spheral-spack-dir spheral-spack-tpls --spec=\"{1}\"".format(tpl_manager_cmd, args.spec)) # Get the host-config name and path. if not args.build_only and not args.host_config: From 96e8bdfdddebd7252e177d8f200d1c23c1041294 Mon Sep 17 00:00:00 2001 From: mdavis36 Date: Tue, 24 Oct 2023 17:27:00 -0700 Subject: [PATCH 4/4] -O1 optimization for python libraries to help compile times (particularly w/ clang) --- cmake/Compilers.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmake/Compilers.cmake b/cmake/Compilers.cmake index b19b31480..b42a29f5b 100644 --- a/cmake/Compilers.cmake +++ b/cmake/Compilers.cmake @@ -64,12 +64,15 @@ message("-- Fortran flags: ${CMAKE_Fortran_FLAGS}") # PYB11 Target Flags #------------------------------------------------------------------------------- set(SPHERAL_PYB11_TARGET_FLAGS + -O1 -Wno-unused-local-typedefs -Wno-overloaded-virtual) if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") list(APPEND SPHERAL_PYB11_TARGET_FLAGS -Wno-self-assign-overloaded - -Wno-delete-non-abstract-non-virtual-dtor) + -Wno-inconsistent-missing-override + -Wno-delete-non-abstract-non-virtual-dtor + -Wno-delete-abstract-non-virtual-dtor) elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") list(APPEND SPHERAL_PYB11_TARGET_FLAGS -Wno-pedantic)