Skip to content

Commit 915b6b7

Browse files
Merge branch 'develop' into dependabot/pip/dot-github/workflows/requirements/pandas-3.0.1
2 parents e5f9c03 + 38fab71 commit 915b6b7

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ jobs:
6060
- 'docs/conf.py'
6161
- 'experiments/**'
6262
- 'lib/**'
63+
- 'modifiers/**'
6364
- 'repo/**'
6465
- 'systems/**'
6566
- 'var/**'

.gitlab/tests/shared_slurm_clusters.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ run_tests_slurm_dane:
124124
# Compilers
125125
- HOST: dane
126126
ARCHCONFIG: llnl-cluster
127-
SYSTEM_ARGS: [compiler=gcc, compiler=clang]
127+
SYSTEM_ARGS: [compiler=gcc, compiler=llvm]
128128
BENCHMARK: osu-micro-benchmarks
129129
run_tests_slurm_matrix:
130130
extends: .run_tests_slurm

modifiers/allocation/modifier.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,7 @@ def pbs_instructions(self, v):
488488
if v.n_gpus:
489489
gpus_per_rank = self.gpus_as_gpus_per_rank(v.n_gpus)
490490
node_spec.append(f"gpus={gpus_per_rank}")
491-
491+
492492
if node_spec:
493493
batch_opts.append(f"-l {':'.join(node_spec)}")
494494
else:

0 commit comments

Comments
 (0)