Skip to content

Commit d50def5

Browse files
ldowenldowen
committed
test-perf newgrp and umask do not work when spheral_ats launches an allocation so brought the chgrp and chmod calls back for run_perf CI job, missed many different ADV_TIME_END changes
1 parent 7a251d2 commit d50def5

6 files changed

Lines changed: 27 additions & 29 deletions

File tree

‎.gitlab/performance.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,12 @@
1010
- if: '$CI_COMMIT_MESSAGE =~ /test-perf/'
1111
dependencies: []
1212
script:
13-
- newgrp sduser
14-
- umask 027
1513
# Directory storing benchmark data is set in scripts/spheral_ats.py
1614
- INSTALL_DIR=$PERF_INSTALL_DIR/${SPEC//%/_}
1715
- cd $INSTALL_DIR
1816
- INSTALL_BENCHMARK_DIR=$(./bin/spheral-ats --get-benchmark)
1917
- PERF_OUT_DIR=$INSTALL_BENCHMARK_DIR/$(date +%s)
18+
- echo "Creating benchmark directory at ${PERF_OUT_DIR}"
2019
- mkdir -p $PERF_OUT_DIR
2120
- echo "Running performance tests using install at $INSTALL_DIR"
2221
- rm -rf perf_logs gpu_perf_logs
@@ -25,6 +24,8 @@
2524
- ./bin/spheral-ats --gpu --ciRun --numNodes 2 --logs gpu_perf_logs $INSTALL_DIR/$PERF_ATS_FILE
2625
# Copy caliper files to the benchmark directory and don't complain if you cant
2726
- cp gpu_perf_logs/*.cali $PERF_OUT_DIR 2>/dev/null || true
27+
- chmod -R gu+r $PERF_OUT_DIR
28+
- chgrp -R sduser $PERF_OUT_DIR
2829

2930
toss_gcc_mpi_perf:
3031
extends: [.toss_perf_shell, .gcc_mpi, .run_perf]

‎scripts/lc/hist_data_utils.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ def create_header(title, file_dict):
1212
<body>
1313
<form>
1414
<select onchange="window.location.href = this.value;">
15-
<option value="">-- Select machine/config --</option>
15+
<option value="">-- Select machine --</option>
1616
"""
1717
for link, ff in file_dict.items():
1818
html_string += " "*6

‎src/CRKSPH/CRKSPH.cc‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ registerState(DataBase<Dimension>& dataBase,
116116
// Otherwise we're just time-evolving the specific energy.
117117
state.enroll(specificThermalEnergy, make_policy<IncrementState<Dimension, Scalar>>());
118118
}
119-
TIME_END("CRKregisterState");
119+
ADV_TIME_END("CRKregisterState");
120120
}
121121

122122
//------------------------------------------------------------------------------
@@ -136,7 +136,7 @@ registerDerivatives(DataBase<Dimension>& dataBase,
136136
mPairAccelerationsPtr = std::make_unique<PairAccelerationsType>(connectivityMap);
137137
}
138138
derivs.enroll(HydroFieldNames::pairAccelerations, *mPairAccelerationsPtr);
139-
TIME_END("CRKregisterDerivatives");
139+
ADV_TIME_END("CRKregisterDerivatives");
140140
}
141141

142142
//------------------------------------------------------------------------------
@@ -150,8 +150,6 @@ evaluateDerivatives(const typename Dimension::Scalar time,
150150
const DataBase<Dimension>& dataBase,
151151
const State<Dimension>& state,
152152
StateDerivatives<Dimension>& derivatives) const {
153-
TIME_BEGIN("CRKevaluateDerivatives");
154-
155153
// Depending on the type of the ArtificialViscosityView, dispatch the call to
156154
// the secondDerivativesLoop
157155
auto& Qhandle = this->artificialViscosity();
@@ -163,7 +161,6 @@ evaluateDerivatives(const typename Dimension::Scalar time,
163161
chai::managed_ptr<ArtificialViscosityView<Dimension, Tensor>> Q = Qhandle.getTensorView();
164162
this->evaluateDerivativesImpl(time, dt, dataBase, state, derivatives, Q);
165163
}
166-
TIME_END("CRKevaluateDerivatives");
167164
}
168165

169166
//------------------------------------------------------------------------------

‎src/CRKSPH/SolidCRKSPH.cc‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ SolidCRKSPH<Dimension>::
141141
initializeProblemStartupDependencies(DataBase<Dimension>& dataBase,
142142
State<Dimension>& state,
143143
StateDerivatives<Dimension>& derivs) {
144-
TIME_BEGIN("SolidCRKinitializeProblemStartupDependencies");
144+
ADV_TIME_BEGIN("SolidCRKinitializeProblemStartupDependencies");
145145

146146
// Call the ancestor.
147147
CRKSPH<Dimension>::initializeProblemStartupDependencies(dataBase, state, derivs);
@@ -150,7 +150,7 @@ initializeProblemStartupDependencies(DataBase<Dimension>& dataBase,
150150
updateStateFields(SolidFieldNames::bulkModulus, state, derivs);
151151
updateStateFields(SolidFieldNames::shearModulus, state, derivs);
152152
updateStateFields(SolidFieldNames::yieldStrength, state, derivs);
153-
TIME_END("SolidCRKinitializeProblemStartupDependencies");
153+
ADV_TIME_END("SolidCRKinitializeProblemStartupDependencies");
154154
}
155155

156156

@@ -201,7 +201,7 @@ registerState(DataBase<Dimension>& dataBase,
201201
mPlasticStrain0.copyFields();
202202
for (auto* fptr: mPlasticStrain0) fptr->name(SolidFieldNames::plasticStrain + "0");
203203
state.enroll(mPlasticStrain0);
204-
TIME_END("SolidCRKregisterState");
204+
ADV_TIME_END("SolidCRKregisterState");
205205
}
206206

207207
//------------------------------------------------------------------------------
@@ -227,7 +227,7 @@ registerDerivatives(DataBase<Dimension>& dataBase,
227227

228228
auto psr = dataBase.solidPlasticStrainRate();
229229
derivs.enroll(psr);
230-
TIME_END("SolidCRKregisterDerivatives");
230+
ADV_TIME_END("SolidCRKregisterDerivatives");
231231
}
232232

233233
//------------------------------------------------------------------------------
@@ -615,7 +615,7 @@ applyGhostBoundaries(State<Dimension>& state,
615615
boundaryPtr->applyFieldListGhostBoundary(fragIDs);
616616
boundaryPtr->applyFieldListGhostBoundary(pTypes);
617617
}
618-
TIME_END("SolidCRKapplyGhostBoundaries");
618+
ADV_TIME_END("SolidCRKapplyGhostBoundaries");
619619
}
620620

621621
//------------------------------------------------------------------------------
@@ -647,7 +647,7 @@ enforceBoundaries(State<Dimension>& state,
647647
boundaryPtr->enforceFieldListBoundary(fragIDs);
648648
boundaryPtr->enforceFieldListBoundary(pTypes);
649649
}
650-
TIME_END("SolidCRKenforceBoundaries");
650+
ADV_TIME_END("SolidCRKenforceBoundaries");
651651
}
652652

653653
//------------------------------------------------------------------------------

‎src/FSISPH/SolidFSISPH.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ registerState(DataBase<Dimension>& dataBase,
363363
state.enroll(pTypes);
364364
state.enroll(mPlasticStrain0);
365365

366-
TIME_END("SolidFSISPHregisterState");
366+
ADV_TIME_END("SolidFSISPHregisterState");
367367
}
368368

369369
//------------------------------------------------------------------------------
@@ -436,7 +436,7 @@ registerDerivatives(DataBase<Dimension>& dataBase,
436436
derivs.enroll(mNewInterfaceSmoothness);
437437
derivs.enroll(mInterfaceAngles);
438438

439-
TIME_END("SolidFSISPHregisterDerivs");
439+
ADV_TIME_END("SolidFSISPHregisterDerivs");
440440
}
441441

442442
//------------------------------------------------------------------------------

‎src/GSPH/GSPH.cc‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,9 @@ GSPH<Dimension>::
9494
initializeProblemStartupDependencies(DataBase<Dimension>& dataBase,
9595
State<Dimension>& state,
9696
StateDerivatives<Dimension>& derivs) {
97-
TIME_BEGIN("GSPHinitializeStartup");
97+
ADV_TIME_BEGIN("GSPHinitializeStartup");
9898
GenericRiemannHydro<Dimension>::initializeProblemStartupDependencies(dataBase, state, derivs);
99-
TIME_END("GSPHinitializeStartup");
99+
ADV_TIME_END("GSPHinitializeStartup");
100100
}
101101

102102
//------------------------------------------------------------------------------
@@ -107,7 +107,7 @@ void
107107
GSPH<Dimension>::
108108
registerState(DataBase<Dimension>& dataBase,
109109
State<Dimension>& state) {
110-
TIME_BEGIN("GSPHregister");
110+
ADV_TIME_BEGIN("GSPHregister");
111111

112112
GenericRiemannHydro<Dimension>::registerState(dataBase,state);
113113

@@ -126,7 +126,7 @@ registerState(DataBase<Dimension>& dataBase,
126126
HydroFieldNames::massDensity));
127127

128128

129-
TIME_END("GSPHregister");
129+
ADV_TIME_END("GSPHregister");
130130
}
131131

132132
//------------------------------------------------------------------------------
@@ -144,7 +144,7 @@ registerDerivatives(DataBase<Dimension>& dataBase,
144144
dataBase.resizeFluidFieldList(mDmassDensityDt, 0.0, IncrementState<Dimension, Scalar>::prefix() + HydroFieldNames::massDensity, false);
145145
derivs.enroll(mDmassDensityDt);
146146

147-
TIME_END("GSPHregisterDerivs");
147+
ADV_TIME_END("GSPHregisterDerivs");
148148
}
149149

150150
//------------------------------------------------------------------------------
@@ -156,7 +156,7 @@ GSPH<Dimension>::
156156
preStepInitialize(const DataBase<Dimension>& dataBase,
157157
State<Dimension>& state,
158158
StateDerivatives<Dimension>& derivs) {
159-
TIME_BEGIN("GSPHpreStepInitialize");
159+
ADV_TIME_BEGIN("GSPHpreStepInitialize");
160160
GenericRiemannHydro<Dimension>::preStepInitialize(dataBase,state,derivs);
161161

162162
if(this->densityUpdate() == MassDensityType::RigorousSumDensity){
@@ -180,7 +180,7 @@ preStepInitialize(const DataBase<Dimension>& dataBase,
180180
boundaryItr < this->boundaryEnd();
181181
++boundaryItr) (*boundaryItr)->finalizeGhostBoundary();
182182
}
183-
TIME_END("GSPHpreStepInitialize");
183+
ADV_TIME_END("GSPHpreStepInitialize");
184184
}
185185

186186
//------------------------------------------------------------------------------
@@ -194,9 +194,9 @@ initialize(const typename Dimension::Scalar time,
194194
const DataBase<Dimension>& dataBase,
195195
State<Dimension>& state,
196196
StateDerivatives<Dimension>& derivs) {
197-
TIME_BEGIN("GSPHinitialize");
197+
ADV_TIME_BEGIN("GSPHinitialize");
198198
auto result = GenericRiemannHydro<Dimension>::initialize(time,dt,dataBase,state,derivs);
199-
TIME_END("GSPHinitialize");
199+
ADV_TIME_END("GSPHinitialize");
200200
return result;
201201
}
202202

@@ -211,9 +211,9 @@ finalizeDerivatives(const typename Dimension::Scalar time,
211211
const DataBase<Dimension>& dataBase,
212212
const State<Dimension>& state,
213213
StateDerivatives<Dimension>& derivs) const {
214-
TIME_BEGIN("GSPHfinalizeDerivs");
214+
ADV_TIME_BEGIN("GSPHfinalizeDerivs");
215215
GenericRiemannHydro<Dimension>::finalizeDerivatives(time,dt,dataBase,state,derivs);
216-
TIME_END("GSPHfinalizeDerivs");
216+
ADV_TIME_END("GSPHfinalizeDerivs");
217217
}
218218

219219
//------------------------------------------------------------------------------
@@ -226,7 +226,7 @@ applyGhostBoundaries(State<Dimension>& state,
226226
StateDerivatives<Dimension>& derivs) {
227227
ADV_TIME_BEGIN("GSPHghostBounds");
228228
GenericRiemannHydro<Dimension>::applyGhostBoundaries(state,derivs);
229-
TIME_END("GSPHghostBounds");
229+
ADV_TIME_END("GSPHghostBounds");
230230
}
231231

232232
//------------------------------------------------------------------------------
@@ -239,7 +239,7 @@ enforceBoundaries(State<Dimension>& state,
239239
StateDerivatives<Dimension>& derivs) {
240240
ADV_TIME_BEGIN("GSPHenforceBounds");
241241
GenericRiemannHydro<Dimension>::enforceBoundaries(state,derivs);
242-
TIME_END("GSPHenforceBounds");
242+
ADV_TIME_END("GSPHenforceBounds");
243243
}
244244

245245

0 commit comments

Comments
 (0)