From d80dc93bc11d3c9d52abfb96b248820415ef3cdd Mon Sep 17 00:00:00 2001 From: Cameron Smith Date: Fri, 14 Jun 2024 14:21:13 -0400 Subject: [PATCH 01/15] simmodsuite: expand version and parasolid range --- cmake/FindSimModSuite.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/FindSimModSuite.cmake b/cmake/FindSimModSuite.cmake index c384bdaa3..3ed47f0f6 100644 --- a/cmake/FindSimModSuite.cmake +++ b/cmake/FindSimModSuite.cmake @@ -84,7 +84,7 @@ string(REGEX REPLACE "${SIM_VERSION}") set(MIN_VALID_SIM_VERSION 15.0.191017) -set(MAX_VALID_SIM_VERSION 2024.0.240219) +set(MAX_VALID_SIM_VERSION 2024.1.240606) if( ${SKIP_SIMMETRIX_VERSION_CHECK} ) message(STATUS "Skipping Simmetrix SimModSuite version check." " This may result in undefined behavior") @@ -124,10 +124,10 @@ endif() option(SIM_PARASOLID "Use Parasolid through Simmetrix" OFF) if (SIM_PARASOLID) set(MIN_SIM_PARASOLID_VERSION 290) - set(MAX_SIM_PARASOLID_VERSION 350) + set(MAX_SIM_PARASOLID_VERSION 361) foreach(version RANGE ${MAX_SIM_PARASOLID_VERSION} - ${MIN_SIM_PARASOLID_VERSION} -10) + ${MIN_SIM_PARASOLID_VERSION} -1) set(SIM_PARASOLID_VERSION ${version}) getSimCadLib("${SIMMODSUITE_INSTALL_DIR}/lib/${SIM_ARCHOS}" SimParasolid${SIM_PARASOLID_VERSION} simParaLib FALSE) From aa4ba9060251f0187c199a9e936e90efc6e2d6f9 Mon Sep 17 00:00:00 2001 From: Cameron Smith Date: Thu, 25 Jul 2024 16:49:23 -0400 Subject: [PATCH 02/15] run fichera with geomSim model --- test/testing.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/testing.cmake b/test/testing.cmake index 59cb9f639..96e9abf2b 100644 --- a/test/testing.cmake +++ b/test/testing.cmake @@ -353,7 +353,7 @@ mpi_test(tet_serial 1 if(ENABLE_SIMMETRIX AND SIM_PARASOLID) mpi_test(test_residual_error_estimate 1 ./residualErrorEstimation_test - "${MESHES}/electromagnetic/fichera.x_t" + "${MESHES}/electromagnetic/fichera_geomSim.smd" "${MESHES}/electromagnetic/fichera_1k.smb") endif() if(PCU_COMPRESS) From 7b8a4a0cfe4222896f2346964bf273832bdd75db Mon Sep 17 00:00:00 2001 From: Cameron Smith Date: Fri, 26 Jul 2024 11:42:38 -0400 Subject: [PATCH 03/15] extra call to SimModel_start() was causing memory error at exit --- test/generate.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/test/generate.cc b/test/generate.cc index 18a181896..473716a88 100644 --- a/test/generate.cc +++ b/test/generate.cc @@ -281,7 +281,6 @@ pNativeModel loadNativeModel() { } void simStart() { - SimModel_start(); SimPartitionedMesh_start(NULL,NULL); if(should_log) Sim_logOn("generate_sim.log"); From 02cfea244deaf84a4c1282d508b9fa0fbf67875d Mon Sep 17 00:00:00 2001 From: Cameron Smith Date: Fri, 26 Jul 2024 14:38:17 -0400 Subject: [PATCH 04/15] use geomsim models --- test/testing.cmake | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/test/testing.cmake b/test/testing.cmake index 96e9abf2b..e8b97537a 100644 --- a/test/testing.cmake +++ b/test/testing.cmake @@ -795,37 +795,37 @@ if(ENABLE_SIMMETRIX) set(MDIR ${MESHES}/curved) mpi_test(curvedSphere 1 ./curvetest - "${MDIR}/sphere1.xmt_txt" + "${MDIR}/sphere1_geomSim.smd" "${MDIR}/sphere1_4.smb") mpi_test(highOrderSolutionTransfer 1 ./highOrderSolutionTransfer - "${MDIR}/sphere1.xmt_txt" + "${MDIR}/sphere1_geomSim.smd" "${MDIR}/sphere1_4.smb") mpi_test(curvedKova 1 ./curvetest - "${MDIR}/Kova.xmt_txt" + "${MDIR}/Kova_geomSim.smd" "${MDIR}/Kova.smb") mpi_test(degen_shpere_full 1 ./degenerate_test - "${MDIR}/sph_full_nat.x_t" + "${MDIR}/sph_full_geomSim.smd" "${MDIR}/sph_full.smb" "sph_full_refine" "3") mpi_test(degen_shpere_no_north 1 ./degenerate_test - "${MDIR}/sph_no_north_nat.x_t" + "${MDIR}/sph_no_north_geomSim.smd" "${MDIR}/sph_no_north.smb" "sph_no_north_refine" "3") mpi_test(degen_shpere_vertical_slice 1 ./degenerate_test - "${MDIR}/sph_vertical_slice_nat.x_t" + "${MDIR}/sph_vertical_slice_geomSim.smd" "${MDIR}/sph_vertical_slice.smb" "sph_vertical_slice_refine" "3") mpi_test(crack_test 1 ./crack_test - "${MDIR}/crack_nat.x_t") + "${MDIR}/crack_geomSim.smd") endif(SIM_PARASOLID) endif() if (PCU_COMPRESS) From b6967f00ae14d478d035e1813b9e5498fb0569e4 Mon Sep 17 00:00:00 2001 From: Cameron Smith Date: Fri, 26 Jul 2024 14:39:41 -0400 Subject: [PATCH 05/15] latest pumi-meshes with geomsim models see #434 --- pumi-meshes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pumi-meshes b/pumi-meshes index 61048f847..7be0e261d 160000 --- a/pumi-meshes +++ b/pumi-meshes @@ -1 +1 @@ -Subproject commit 61048f84713c15182d6cee972e035552e66564ea +Subproject commit 7be0e261d69d45a6f0614c76c66eff2bba81f4ba From 474cce002acbe20c7d598496338bf7bd3b1a6999 Mon Sep 17 00:00:00 2001 From: Jacob Merson Date: Sat, 27 Jul 2024 18:43:25 -0700 Subject: [PATCH 06/15] Update apfElement.cc This commit fixes #440 which will now work with any number of components. --- apf/apfElement.cc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/apf/apfElement.cc b/apf/apfElement.cc index 161de8df1..534e6a35c 100644 --- a/apf/apfElement.cc +++ b/apf/apfElement.cc @@ -121,9 +121,12 @@ void Element::getNodeData() void Element::getElementNodeData(NewArray& d) { - d.allocated() ? d.resize(nen) : d.allocate(nen); - for (int i = 0; i < nen; i++) - d[i] = nodeData[i]; + d.resize(nodeData.size()); + // to get the iterator 1 past the end without indexing one past the + // end we get the address to the last element then do ptr arithmetic + // to get one past that. Indexing at nodeData.size() can lead to segfault + // as you are actually accessing that memory. + std::copy(&nodeData[0], (&nodeData[nodeData.size()-1])+1, &d[0]); } }//namespace apf From 5fe40eab5f5a6f31d53ee80413db38212a278823 Mon Sep 17 00:00:00 2001 From: Cameron Smith Date: Thu, 8 Aug 2024 16:28:16 -0400 Subject: [PATCH 07/15] spr: add thesis section to ref --- spr/spr.tex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spr/spr.tex b/spr/spr.tex index 226cb02b4..ebd0c40c4 100644 --- a/spr/spr.tex +++ b/spr/spr.tex @@ -11,7 +11,7 @@ \section{Overview} An SPR-based error estimation procedure is defined in detail -in Jie Wan's thesis. +in Section 2.2.2 of Jie Wan's RPI thesis. We have reimplemented this system using the latest APF libraries and it supports the Albany adaptive cycle. This document details the inner workings of this estimator. From 3e9f07b85151e80e035ad94b29d3f0d458026ed9 Mon Sep 17 00:00:00 2001 From: Cameron Smith Date: Fri, 23 Aug 2024 20:41:14 -0400 Subject: [PATCH 08/15] silence warning the warning with GCC 12.3.0 loop variable 'm' creates a copy from type 'const std::pair' [-Werror=range-loop-construct] --- mds/mdsCGNS.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mds/mdsCGNS.cc b/mds/mdsCGNS.cc index acdef4aae..4434ba426 100644 --- a/mds/mdsCGNS.cc +++ b/mds/mdsCGNS.cc @@ -177,19 +177,19 @@ struct MeshDataGroup if (components.size() == 1) { std::cout << "Scalar Group has " << components.size() << " related componenets: " << std::endl; - for (const auto m : components) + for (const auto& m : components) std::cout << "Field " << m.second.name << " @ " << m.second.si << " " << m.second.fi << std::endl; } else if (components.size() == 3) { std::cout << "Vector Group has " << components.size() << " related componenets: " << std::endl; - for (const auto m : components) + for (const auto& m : components) std::cout << "Field " << m.second.name << " @ " << m.second.si << " " << m.second.fi << std::endl; } else if (components.size() == 9) { std::cout << "Matrix Group has " << components.size() << " related componenets: " << std::endl; - for (const auto m : components) + for (const auto& m : components) std::cout << "Field " << m.second.name << " @ " << m.second.si << " " << m.second.fi << std::endl; } else From 4aa2326813a9214f2b1c741e0526ba4be2d86fb7 Mon Sep 17 00:00:00 2001 From: Cameron Smith Date: Fri, 23 Aug 2024 22:20:27 -0400 Subject: [PATCH 09/15] cgns: support spack install see #391 --- apf/apfCGNS.cc | 4 ++-- mds/mdsCGNS.cc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apf/apfCGNS.cc b/apf/apfCGNS.cc index 4debbb58b..445a6e353 100644 --- a/apf/apfCGNS.cc +++ b/apf/apfCGNS.cc @@ -1051,11 +1051,11 @@ void WriteCGNS(const char *prefix, apf::Mesh *m, const apf::CGNSBCMap &cgnsBCMap auto communicator = PCU_Get_Comm(); cgp_mpi_comm(communicator); // - cgp_pio_mode(CGNS_ENUMV(CGP_INDEPENDENT)); + cgp_pio_mode(CGP_INDEPENDENT); CGNS cgns; cgns.fname = std::string(prefix); - if (cgp_open(prefix, CGNS_ENUMV(CG_MODE_WRITE), &cgns.index)) + if (cgp_open(prefix, CG_MODE_WRITE, &cgns.index)) cgp_error_exit(); { diff --git a/mds/mdsCGNS.cc b/mds/mdsCGNS.cc index 4434ba426..1d884cca0 100644 --- a/mds/mdsCGNS.cc +++ b/mds/mdsCGNS.cc @@ -1056,8 +1056,8 @@ apf::Mesh2 *DoIt(gmi_model *g, const std::string &fname, apf::CGNSBCMap &cgnsBCM int cgid = -1; auto comm = PCU_Get_Comm(); cgp_mpi_comm(comm); - cgp_pio_mode(CGNS_ENUMV(CGP_INDEPENDENT)); - cgp_open(fname.c_str(), CGNS_ENUMV(CG_MODE_READ), &cgid); + cgp_pio_mode(CGP_INDEPENDENT); + cgp_open(fname.c_str(), CG_MODE_READ, &cgid); int nbases = -1; cg_nbases(cgid, &nbases); From 9f91f219ccb4ba3234fd9f7c1aaf2deeb36fc4f7 Mon Sep 17 00:00:00 2001 From: Cameron Smith Date: Sat, 24 Aug 2024 11:08:58 -0400 Subject: [PATCH 10/15] replace VLAs when compiling with cgns enabled c++14 is enabled and these were being flagged as warnings which were promotted to errors --- test/convert.cc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/test/convert.cc b/test/convert.cc index 6813e45b1..ac537ba99 100644 --- a/test/convert.cc +++ b/test/convert.cc @@ -23,6 +23,7 @@ #include #include #include +#include //std::array using namespace std; @@ -246,7 +247,7 @@ void addFathersTag(pGModel simModel, pParMesh sim_mesh, apf::Mesh* simApfMesh, c int nvert=i; PList_delete(listV); - double coordNewPt[nvert][3]; + std::vector> coordNewPt(nvert,{0,0,0}); for(i=0; i< nvert ; i++) { int* markedData; if(!EN_getDataPtr((pEntity)vrts[i],myFather,(void**)&markedData)){ // not sure about marked yet @@ -347,13 +348,13 @@ void addFathersTag(pGModel simModel, pParMesh sim_mesh, apf::Mesh* simApfMesh, c int* vtxData = new int[1]; vtxData[0] = count2D; EN_attachDataPtr((pEntity)vrts[i],myFather,(void*)vtxData); - V_coord(vrts[i],coordNewPt[i]); + V_coord(vrts[i],coordNewPt[i].data()); fprintf ( fcr, "%.15E %.15E %d %d %d %d \n", coordNewPt[i][0],coordNewPt[i][1], vClassDim, foundESTag, foundETag, foundEETag ); } } - double coordFather[nvert][3]; + std::vector> coordFather(nvert,{0,0,0}); int fatherIds[4]; //store the ids of the fathers (vertices) on the root face for(i=0; i< nvert ; i++) { int* fatherIdPtr; @@ -365,7 +366,7 @@ void addFathersTag(pGModel simModel, pParMesh sim_mesh, apf::Mesh* simApfMesh, c } assert(exists); fatherIds[i] = fatherIdPtr[0]; - V_coord(vrts[i],coordFather[i]); + V_coord(vrts[i],coordFather[i].data()); fprintf ( fcn, "%d ", fatherIds[i]); } fprintf ( fcn, "\n"); From 279c82c5c265b15723fb31feb70a2fb31c27989a Mon Sep 17 00:00:00 2001 From: Cameron Smith Date: Sat, 24 Aug 2024 11:42:12 -0400 Subject: [PATCH 11/15] clean under asan sanitizer with gcc 12.3.0 --- test/convert.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/convert.cc b/test/convert.cc index ac537ba99..d14e533cd 100644 --- a/test/convert.cc +++ b/test/convert.cc @@ -194,6 +194,7 @@ void addFathersTag(pGModel simModel, pParMesh sim_mesh, apf::Mesh* simApfMesh, c int id = GEN_tag(gface); if(id==ExtruRootId) ExtruRootFace=gface; } + GFIter_delete(gfIter); assert(ExtruRootFace != NULL); // all of the work so far assumes translation extrusion. Rotation extrusion (sweeping extruded entiy over an arc of some angle about // a given axis) is useful but this would require some code change. The principle is the same. Every root entity has another @@ -345,7 +346,7 @@ void addFathersTag(pGModel simModel, pParMesh sim_mesh, apf::Mesh* simApfMesh, c } PCU_ALWAYS_ASSERT(foundEETag != 0); count2D++; - int* vtxData = new int[1]; + int* vtxData = new int; vtxData[0] = count2D; EN_attachDataPtr((pEntity)vrts[i],myFather,(void*)vtxData); V_coord(vrts[i],coordNewPt[i].data()); @@ -415,7 +416,7 @@ void addFathersTag(pGModel simModel, pParMesh sim_mesh, apf::Mesh* simApfMesh, c } } my2Dfath=fatherIds[iMin]; - int* vtxData = new int[1]; + int* vtxData = new int; vtxData[0] = my2Dfath; EN_attachDataPtr((pEntity)sonVtx,myFather,(void*)vtxData); } @@ -425,6 +426,7 @@ void addFathersTag(pGModel simModel, pParMesh sim_mesh, apf::Mesh* simApfMesh, c } PList_delete(faces); } //end root face iterator + FIter_delete(fIter); } apf::MeshSIM* cake = reinterpret_cast(simApfMesh); cake->createIntTag("fathers2D", myFather, 1); From 0e5dd3688ebb136c493b33b17e7dbe62ee65174e Mon Sep 17 00:00:00 2001 From: Cameron Smith Date: Sun, 25 Aug 2024 06:40:01 -0400 Subject: [PATCH 12/15] add sim+cgns build --- ...enabled_pr_comment_trigger_self_hosted.yml | 48 ++++++++++++++++--- 1 file changed, 41 insertions(+), 7 deletions(-) diff --git a/.github/workflows/simmetrix_enabled_pr_comment_trigger_self_hosted.yml b/.github/workflows/simmetrix_enabled_pr_comment_trigger_self_hosted.yml index 00a64d3cc..b56d45c04 100644 --- a/.github/workflows/simmetrix_enabled_pr_comment_trigger_self_hosted.yml +++ b/.github/workflows/simmetrix_enabled_pr_comment_trigger_self_hosted.yml @@ -27,8 +27,8 @@ jobs: submodules: recursive path: 'core_${{ github.event.issue.number }}' - - name: build - id: build + - name: build_sim + id: build_sim shell: bash run: | set +e #avoid exiting when lua modules return non-zero on 'warning' messages @@ -41,7 +41,7 @@ jobs: set -e cmake -S core_${{ github.event.issue.number }} \ - -B ${RUNNER_TEMP}/build \ + -B ${RUNNER_TEMP}/buildSim \ -DCMAKE_CXX_COMPILER=mpicxx \ -DCMAKE_C_COMPILER=mpicc \ -DCMAKE_VERBOSE_MAKEFILE=ON \ @@ -55,16 +55,50 @@ jobs: -DIS_TESTING=ON \ -DSCOREC_CXX_WARNINGS=ON \ -DCMAKE_BUILD_TYPE=Release - cmake --build ${RUNNER_TEMP}/build -j 4 - ctest --test-dir ${RUNNER_TEMP}/build --output-on-failure + cmake --build ${RUNNER_TEMP}/buildSim -j 4 + ctest --test-dir ${RUNNER_TEMP}/buildSim --output-on-failure + + - name: build_sim_cgns + id: build_sim_cgns + shell: bash + run: | + set +e #avoid exiting when lua modules return non-zero on 'warning' messages + module use /opt/scorec/spack/rhel9/v0201_4/lmod/linux-rhel9-x86_64/Core/ + module load gcc/12.3.0-iil3lno + module load mpich/4.1.1-xpoyz4t + module load simmetrix-simmodsuite/2024.0-240119dev-7abimo4 + module load zoltan/3.83-hap4ggo + module load cmake/3.26.3-2duxfcd + module load cgns/develop-cc4dfwp + set -e + + cmake -S core_${{ github.event.issue.number }} \ + -B ${RUNNER_TEMP}/buildSimCgns\ + -DCMAKE_CXX_COMPILER=mpicxx \ + -DCMAKE_C_COMPILER=mpicc \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DENABLE_ZOLTAN=ON \ + -DENABLE_SIMMETRIX=ON \ + -DSIM_MPI=mpich4.1.1 \ + -DSIM_PARASOLID=ON \ + -DENABLE_CGNS=on \ + -DSIM_ACIS=ON \ + -DSKIP_SIMMETRIX_VERSION_CHECK=ON \ + -DMESHES=${{github.workspace}}/core_${{ github.event.issue.number }}/pumi-meshes \ + -DIS_TESTING=ON \ + -DSCOREC_CXX_WARNINGS=ON \ + -DCMAKE_BUILD_TYPE=Release + cmake --build ${RUNNER_TEMP}/buildSimCgns -j 4 + ctest --test-dir ${RUNNER_TEMP}/buildSimCgns --output-on-failure - name: Save Result Link if: ${{ !cancelled() }} #prepare report unless the job was cancelled run: | mkdir -p ./pr echo "${{ github.event.issue.number }}" > ./pr/issueNumber - echo -n "Test Result: ${{ steps.build.outcome }} " > ./pr/message - echo "[(details)](https://github.com/${{github.repository}}/actions/runs/${{ github.run_id }})" >> ./pr/message + echo "[Build Log](https://github.com/${{github.repository}}/actions/runs/${{ github.run_id }})" >> ./pr/message + echo "Simmetrix Test Result: ${{ steps.build_sim.outcome }} " > ./pr/message + echo "Simmetrix + CGNS Test Result: ${{ steps.build_sim_cgns.outcome }} " > ./pr/message - name: Upload result if: ${{ !cancelled() }} #upload unless the job was cancelled From 3d3a6ef59429a656053c7800cfd73a2e2c6a44f4 Mon Sep 17 00:00:00 2001 From: Cameron Smith Date: Sun, 25 Aug 2024 06:40:43 -0400 Subject: [PATCH 13/15] formatting --- ...ix_enabled_pr_comment_trigger_self_hosted.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/simmetrix_enabled_pr_comment_trigger_self_hosted.yml b/.github/workflows/simmetrix_enabled_pr_comment_trigger_self_hosted.yml index b56d45c04..c6d52886e 100644 --- a/.github/workflows/simmetrix_enabled_pr_comment_trigger_self_hosted.yml +++ b/.github/workflows/simmetrix_enabled_pr_comment_trigger_self_hosted.yml @@ -2,7 +2,7 @@ name: simmetrx_enabled_pr_comment_trigger_self_hosted # Controls when the workflow will run on: - issue_comment: + issue_comment: types: [created] # Allows you to run this workflow manually from the Actions tab @@ -26,20 +26,20 @@ jobs: ref: refs/pull/${{ github.event.issue.number }}/head submodules: recursive path: 'core_${{ github.event.issue.number }}' - + - name: build_sim id: build_sim shell: bash run: | set +e #avoid exiting when lua modules return non-zero on 'warning' messages module use /opt/scorec/spack/rhel9/v0201_4/lmod/linux-rhel9-x86_64/Core/ - module load gcc/12.3.0-iil3lno + module load gcc/12.3.0-iil3lno module load mpich/4.1.1-xpoyz4t module load simmetrix-simmodsuite/2024.0-240119dev-7abimo4 module load zoltan/3.83-hap4ggo module load cmake/3.26.3-2duxfcd set -e - + cmake -S core_${{ github.event.issue.number }} \ -B ${RUNNER_TEMP}/buildSim \ -DCMAKE_CXX_COMPILER=mpicxx \ @@ -54,7 +54,7 @@ jobs: -DMESHES=${{github.workspace}}/core_${{ github.event.issue.number }}/pumi-meshes \ -DIS_TESTING=ON \ -DSCOREC_CXX_WARNINGS=ON \ - -DCMAKE_BUILD_TYPE=Release + -DCMAKE_BUILD_TYPE=Release cmake --build ${RUNNER_TEMP}/buildSim -j 4 ctest --test-dir ${RUNNER_TEMP}/buildSim --output-on-failure @@ -64,14 +64,14 @@ jobs: run: | set +e #avoid exiting when lua modules return non-zero on 'warning' messages module use /opt/scorec/spack/rhel9/v0201_4/lmod/linux-rhel9-x86_64/Core/ - module load gcc/12.3.0-iil3lno + module load gcc/12.3.0-iil3lno module load mpich/4.1.1-xpoyz4t module load simmetrix-simmodsuite/2024.0-240119dev-7abimo4 module load zoltan/3.83-hap4ggo module load cmake/3.26.3-2duxfcd module load cgns/develop-cc4dfwp set -e - + cmake -S core_${{ github.event.issue.number }} \ -B ${RUNNER_TEMP}/buildSimCgns\ -DCMAKE_CXX_COMPILER=mpicxx \ @@ -87,7 +87,7 @@ jobs: -DMESHES=${{github.workspace}}/core_${{ github.event.issue.number }}/pumi-meshes \ -DIS_TESTING=ON \ -DSCOREC_CXX_WARNINGS=ON \ - -DCMAKE_BUILD_TYPE=Release + -DCMAKE_BUILD_TYPE=Release cmake --build ${RUNNER_TEMP}/buildSimCgns -j 4 ctest --test-dir ${RUNNER_TEMP}/buildSimCgns --output-on-failure From 6e9ee8da90af2c32113b4f136a01469712490a56 Mon Sep 17 00:00:00 2001 From: Cameron Smith Date: Sun, 25 Aug 2024 06:59:47 -0400 Subject: [PATCH 14/15] move nightly test+merge to rhel9 --- cdash/nightly.cmake | 14 ++++++++++++-- cdash/nightly.sh | 15 +++++++-------- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/cdash/nightly.cmake b/cdash/nightly.cmake index 596d3f5d5..342947d0c 100644 --- a/cdash/nightly.cmake +++ b/cdash/nightly.cmake @@ -5,7 +5,7 @@ SET(CTEST_TEST_TYPE Nightly) set(CTEST_BUILD_CONFIGURATION RelWithDebInfo) set(CTEST_NIGHTLY_START_TIME "17:00:00 EST") -set(CTEST_SITE "cranium.scorec.rpi.edu" ) +set(CTEST_SITE "checkers.scorec.rpi.edu" ) set(CTEST_DROP_METHOD "http") set(CTEST_DROP_SITE "my.cdash.org") set(CTEST_DROP_LOCATION "/submit.php?project=SCOREC") @@ -123,6 +123,11 @@ function(check_current_branch BRANCH_NAME CONFIG_OPTS ERRVAR) file(MAKE_DIRECTORY "${CTEST_BINARY_DIRECTORY}/${BRANCH_NAME}") + execute_process(COMMAND df -h /tmp OUTPUT_VARIABLE outVar) + message(STATUS "df result {\n${outVar}}") + execute_process(COMMAND pwd OUTPUT_VARIABLE outVar) + message(STATUS "pwd result output {\n${outVar}}") + ctest_configure( BUILD "${CTEST_BINARY_DIRECTORY}/${BRANCH_NAME}" SOURCE "${CTEST_SOURCE_DIRECTORY}/${CTEST_PROJECT_NAME}" @@ -134,6 +139,11 @@ function(check_current_branch BRANCH_NAME CONFIG_OPTS message("${BRANCH_NAME} config passed") endif() + execute_process(COMMAND df -h /tmp OUTPUT_VARIABLE outVar) + message(STATUS "df result {\n${outVar}}") + execute_process(COMMAND pwd OUTPUT_VARIABLE outVar) + message(STATUS "pwd result output {\n${outVar}}") + ctest_build( BUILD "${CTEST_BINARY_DIRECTORY}/${BRANCH_NAME}" NUMBER_ERRORS NUM_BUILD_ERRORS @@ -313,7 +323,7 @@ SET(CONFIGURE_OPTIONS-sim "${CONFIGURE_OPTIONS}" "-DENABLE_SIMMETRIX:BOOL=ON" "-DSIM_PARASOLID:BOOL=ON" - "-DSIM_MPI:STRING=mpich3.3.2" + "-DSIM_MPI:STRING=mpich4.1.1" ) setup_repo() diff --git a/cdash/nightly.sh b/cdash/nightly.sh index cf4c37b9b..302d2aea5 100755 --- a/cdash/nightly.sh +++ b/cdash/nightly.sh @@ -8,14 +8,13 @@ export PATH=/usr/share/lmod/lmod/libexec:$PATH #setup spack modules unset MODULEPATH -module unuse /opt/scorec/spack/lmod/linux-rhel7-x86_64/Core -module use /opt/scorec/modules -module use /opt/scorec/spack/v0154_2/lmod/linux-rhel7-x86_64/Core -module load gcc/10.1.0 -module load mpich/3.3.2 -module load simmetrix-simmodsuite/17.0-220516 -module load zoltan/3.83-int32 -module load cmake/3.20.0 +module use /opt/scorec/spack/rhel9/v0201_4/lmod/linux-rhel9-x86_64/Core/ +module load gcc/12.3.0-iil3lno +module load mpich/4.1.1-xpoyz4t +module load simmetrix-simmodsuite/2024.0-240119dev-7abimo4 +module load zoltan/3.83-hap4ggo +module load cmake/3.26.3-2duxfcd +module load cgns/develop-cc4dfwp #cdash output root d=/lore/cwsmith/nightlyBuilds/ From 399ac8f30770ef514c8ace22c7ccc17ee2ef16ab Mon Sep 17 00:00:00 2001 From: Cameron Smith Date: Sun, 25 Aug 2024 07:01:47 -0400 Subject: [PATCH 15/15] user name change --- cdash/nightly.cmake | 2 +- cdash/nightly.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cdash/nightly.cmake b/cdash/nightly.cmake index 342947d0c..8ad7b72d6 100644 --- a/cdash/nightly.cmake +++ b/cdash/nightly.cmake @@ -12,7 +12,7 @@ set(CTEST_DROP_LOCATION "/submit.php?project=SCOREC") set(CTEST_DROP_SITE_CDASH TRUE) set(CTEST_BUILD_NAME "linux-gcc-${CTEST_BUILD_CONFIGURATION}") -set(CTEST_DASHBOARD_ROOT "/lore/cwsmith/nightlyBuilds/" ) +set(CTEST_DASHBOARD_ROOT "/lore/smithc11/nightlyBuilds/" ) set(CTEST_CMAKE_GENERATOR "Unix Makefiles") set(CTEST_BUILD_FLAGS -j4) diff --git a/cdash/nightly.sh b/cdash/nightly.sh index 302d2aea5..e7da2bccc 100755 --- a/cdash/nightly.sh +++ b/cdash/nightly.sh @@ -1,6 +1,6 @@ #!/bin/bash -x source /etc/profile -source /users/cwsmith/.bash_profile +source /users/smithc11/.bash_profile #setup lmod export PATH=/usr/share/lmod/lmod/libexec:$PATH @@ -17,7 +17,7 @@ module load cmake/3.26.3-2duxfcd module load cgns/develop-cc4dfwp #cdash output root -d=/lore/cwsmith/nightlyBuilds/ +d=/lore/smithc11/nightlyBuilds/ cd $d #remove compilation directories created by previous nightly.cmake runs [ -d build ] && rm -rf build/