From 0652ed86ea6cedeb854b8549d0d33dee519ea1a7 Mon Sep 17 00:00:00 2001
From: Danny Auble <da@schedmd.com>
Date: Thu, 25 Apr 2019 10:26:04 -0600
Subject: [PATCH] Rename Cray plugins cray_aries in preperation for
Cray/Shasta.
Bug 6440
---
NEWS | 1 +
RELEASE_NOTES | 13 ++
configure | 18 +-
configure.ac | 16 +-
src/common/gres.c | 2 +-
src/common/node_select.c | 14 +-
src/common/read_config.c | 14 +-
src/common/read_config.h | 4 +-
src/common/slurm_protocol_api.c | 4 +-
src/plugins/acct_gather_energy/Makefile.am | 2 +-
src/plugins/acct_gather_energy/Makefile.in | 2 +-
.../acct_gather_energy/cray/Makefile.am | 15 --
.../acct_gather_energy/cray_aries/Makefile.am | 15 ++
.../{cray => cray_aries}/Makefile.in | 47 ++---
.../acct_gather_energy_cray_aries.c} | 9 +-
src/plugins/core_spec/Makefile.am | 2 +-
src/plugins/core_spec/Makefile.in | 2 +-
src/plugins/core_spec/cray/Makefile.am | 14 --
src/plugins/core_spec/cray_aries/Makefile.am | 14 ++
.../{cray => cray_aries}/Makefile.in | 58 +++---
.../core_spec_cray_aries.c} | 6 +-
src/plugins/job_submit/Makefile.am | 2 +-
src/plugins/job_submit/Makefile.in | 2 +-
src/plugins/job_submit/cray/Makefile.am | 13 --
src/plugins/job_submit/cray_aries/Makefile.am | 13 ++
.../{cray => cray_aries}/Makefile.in | 41 ++--
.../job_submit_cray_aries.c} | 8 +-
src/plugins/power/Makefile.am | 2 +-
src/plugins/power/Makefile.in | 2 +-
src/plugins/power/cray/Makefile.am | 22 ---
src/plugins/power/cray_aries/Makefile.am | 22 +++
.../power/{cray => cray_aries}/Makefile.in | 60 +++---
.../power_cray_aries.c} | 6 +-
src/plugins/proctrack/Makefile.am | 2 +-
src/plugins/proctrack/Makefile.in | 4 +-
.../{cray => cray_aries}/Makefile.am | 6 +-
.../{cray => cray_aries}/Makefile.in | 41 ++--
.../proctrack_cray_aries.c} | 6 +-
src/plugins/select/Makefile.am | 26 +--
src/plugins/select/Makefile.in | 26 +--
src/plugins/select/cray/Makefile.am | 15 --
src/plugins/select/cray_aries/Makefile.am | 15 ++
.../select/{cray => cray_aries}/Makefile.in | 47 ++---
src/plugins/select/{cray => cray_aries}/ccm.c | 0
src/plugins/select/{cray => cray_aries}/ccm.h | 0
.../select_cray_aries.c} | 6 +-
src/plugins/switch/Makefile.am | 2 +-
src/plugins/switch/Makefile.in | 2 +-
.../switch/{cray => cray_aries}/Makefile.am | 16 +-
.../switch/{cray => cray_aries}/Makefile.in | 176 +++++++++---------
.../switch/{cray => cray_aries}/cookies.c | 2 +-
src/plugins/switch/{cray => cray_aries}/gpu.c | 2 +-
src/plugins/switch/{cray => cray_aries}/iaa.c | 2 +-
.../switch/{cray => cray_aries}/pe_info.c | 2 +-
.../switch/{cray => cray_aries}/scaling.c | 2 +-
.../switch_cray_aries.c} | 8 +-
.../switch_cray_aries.h} | 8 +-
.../switch/{cray => cray_aries}/util.c | 2 +-
src/plugins/task/Makefile.am | 2 +-
src/plugins/task/Makefile.in | 4 +-
.../task/{cray => cray_aries}/Makefile.am | 8 +-
.../task/{cray => cray_aries}/Makefile.in | 43 ++---
.../task_cray_aries.c} | 8 +-
src/slurmctld/job_scheduler.c | 2 +-
src/slurmctld/step_mgr.c | 4 +-
src/slurmd/slurmd/slurmd.c | 2 +-
src/slurmd/slurmstepd/slurmstepd_job.c | 2 +-
src/srun/srun.c | 2 +-
68 files changed, 494 insertions(+), 466 deletions(-)
delete mode 100644 src/plugins/acct_gather_energy/cray/Makefile.am
create mode 100644 src/plugins/acct_gather_energy/cray_aries/Makefile.am
rename src/plugins/acct_gather_energy/{cray => cray_aries}/Makefile.in (94%)
rename src/plugins/acct_gather_energy/{cray/acct_gather_energy_cray.c => cray_aries/acct_gather_energy_cray_aries.c} (97%)
delete mode 100644 src/plugins/core_spec/cray/Makefile.am
create mode 100644 src/plugins/core_spec/cray_aries/Makefile.am
rename src/plugins/core_spec/{cray => cray_aries}/Makefile.in (91%)
rename src/plugins/core_spec/{cray/core_spec_cray.c => cray_aries/core_spec_cray_aries.c} (97%)
delete mode 100644 src/plugins/job_submit/cray/Makefile.am
create mode 100644 src/plugins/job_submit/cray_aries/Makefile.am
rename src/plugins/job_submit/{cray => cray_aries}/Makefile.in (95%)
rename src/plugins/job_submit/{cray/job_submit_cray.c => cray_aries/job_submit_cray_aries.c} (94%)
delete mode 100644 src/plugins/power/cray/Makefile.am
create mode 100644 src/plugins/power/cray_aries/Makefile.am
rename src/plugins/power/{cray => cray_aries}/Makefile.in (92%)
rename src/plugins/power/{cray/power_cray.c => cray_aries/power_cray_aries.c} (99%)
rename src/plugins/proctrack/{cray => cray_aries}/Makefile.am (54%)
rename src/plugins/proctrack/{cray => cray_aries}/Makefile.in (95%)
rename src/plugins/proctrack/{cray/proctrack_cray.c => cray_aries/proctrack_cray_aries.c} (98%)
delete mode 100644 src/plugins/select/cray/Makefile.am
create mode 100644 src/plugins/select/cray_aries/Makefile.am
rename src/plugins/select/{cray => cray_aries}/Makefile.in (94%)
rename src/plugins/select/{cray => cray_aries}/ccm.c (100%)
rename src/plugins/select/{cray => cray_aries}/ccm.h (100%)
rename src/plugins/select/{cray/select_cray.c => cray_aries/select_cray_aries.c} (99%)
rename src/plugins/switch/{cray => cray_aries}/Makefile.am (51%)
rename src/plugins/switch/{cray => cray_aries}/Makefile.in (77%)
rename src/plugins/switch/{cray => cray_aries}/cookies.c (99%)
rename src/plugins/switch/{cray => cray_aries}/gpu.c (99%)
rename src/plugins/switch/{cray => cray_aries}/iaa.c (99%)
rename src/plugins/switch/{cray => cray_aries}/pe_info.c (99%)
rename src/plugins/switch/{cray => cray_aries}/scaling.c (99%)
rename src/plugins/switch/{cray/switch_cray.c => cray_aries/switch_cray_aries.c} (99%)
rename src/plugins/switch/{cray/switch_cray.h => cray_aries/switch_cray_aries.h} (97%)
rename src/plugins/switch/{cray => cray_aries}/util.c (99%)
rename src/plugins/task/{cray => cray_aries}/Makefile.am (50%)
rename src/plugins/task/{cray => cray_aries}/Makefile.in (95%)
rename src/plugins/task/{cray/task_cray.c => cray_aries/task_cray_aries.c} (99%)
diff --git a/NEWS b/NEWS
index b1248238914..f4932e8adb3 100644
--- a/NEWS
+++ b/NEWS
@@ -60,6 +60,7 @@ documents those changes that are of interest to users and administrators.
-- Add new site_factor plugin type to permit sites to build plugins to set
and modify the site priority factor value both initially on job submission,
and periodically every PriorityCalcPeriod.
+ -- Rename Cray plugins cray_aries in preperation for Cray/Shasta.
* Changes in Slurm 19.05.0pre3
==============================
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index bad156e169c..e5d9260c7e4 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -145,6 +145,19 @@ configuration files will be required before upgrading to this release.
health of the individual compute nodes. The SelectTypeParameters options
of NHC_ABSOLUTELY_NO, NHC_NO_STEPS, and NHC_NO have been removed as well.
+ -- All other Cray plugins have been renamed to cray_aries, namely ...
+
+ acct_gather_energy/cray
+ core_spec/cray
+ job_submit/cray
+ power/cray
+ proctrack/cray
+ select/cray
+ switch/cray
+ task/cray
+
+ all are now cray_aries. You will need to update your slurm.conf to
+ reflect these changes.
RPMBUILD CHANGES
================
diff --git a/configure b/configure
index 8a606c977c5..91b8f1f405e 100755
--- a/configure
+++ b/configure
@@ -24559,7 +24559,7 @@ $as_echo "${x_ac_deprecated=no}" >&6; }
-ac_config_files="$ac_config_files Makefile auxdir/Makefile contribs/Makefile contribs/cray/Makefile contribs/cray/csm/Makefile contribs/cray/slurmsmwd/Makefile contribs/lua/Makefile contribs/mic/Makefile contribs/pam/Makefile contribs/pam_slurm_adopt/Makefile contribs/perlapi/Makefile contribs/perlapi/libslurm/Makefile contribs/perlapi/libslurm/perl/Makefile.PL contribs/perlapi/libslurmdb/Makefile contribs/perlapi/libslurmdb/perl/Makefile.PL contribs/seff/Makefile contribs/torque/Makefile contribs/openlava/Makefile contribs/sgather/Makefile contribs/sgi/Makefile contribs/sjobexit/Makefile contribs/pmi/Makefile contribs/pmi2/Makefile doc/Makefile doc/man/Makefile doc/man/man1/Makefile doc/man/man3/Makefile doc/man/man5/Makefile doc/man/man8/Makefile doc/html/Makefile doc/html/configurator.html doc/html/configurator.easy.html etc/Makefile src/Makefile src/api/Makefile src/bcast/Makefile src/common/Makefile src/layouts/Makefile src/layouts/power/Makefile src/layouts/unit/Makefile src/database/Makefile src/sacct/Makefile src/sacctmgr/Makefile src/sreport/Makefile src/salloc/Makefile src/sbatch/Makefile src/sbcast/Makefile src/sattach/Makefile src/scancel/Makefile src/scontrol/Makefile src/sdiag/Makefile src/sinfo/Makefile src/slurmctld/Makefile src/slurmd/Makefile src/slurmd/common/Makefile src/slurmd/slurmd/Makefile src/slurmd/slurmstepd/Makefile src/slurmdbd/Makefile src/smap/Makefile src/sprio/Makefile src/squeue/Makefile src/srun/Makefile src/srun/libsrun/Makefile src/sshare/Makefile src/sstat/Makefile src/strigger/Makefile src/sview/Makefile src/plugins/Makefile src/plugins/accounting_storage/Makefile src/plugins/accounting_storage/common/Makefile src/plugins/accounting_storage/filetxt/Makefile src/plugins/accounting_storage/mysql/Makefile src/plugins/accounting_storage/none/Makefile src/plugins/accounting_storage/slurmdbd/Makefile src/plugins/acct_gather_energy/Makefile src/plugins/acct_gather_energy/cray/Makefile src/plugins/acct_gather_energy/rapl/Makefile src/plugins/acct_gather_energy/ibmaem/Makefile src/plugins/acct_gather_energy/ipmi/Makefile src/plugins/acct_gather_energy/none/Makefile src/plugins/acct_gather_energy/xcc/Makefile src/plugins/acct_gather_interconnect/Makefile src/plugins/acct_gather_interconnect/ofed/Makefile src/plugins/acct_gather_interconnect/none/Makefile src/plugins/acct_gather_filesystem/Makefile src/plugins/acct_gather_filesystem/lustre/Makefile src/plugins/acct_gather_filesystem/none/Makefile src/plugins/acct_gather_profile/Makefile src/plugins/acct_gather_profile/hdf5/Makefile src/plugins/acct_gather_profile/hdf5/sh5util/Makefile src/plugins/acct_gather_profile/influxdb/Makefile src/plugins/acct_gather_profile/none/Makefile src/plugins/auth/Makefile src/plugins/auth/munge/Makefile src/plugins/auth/none/Makefile src/plugins/burst_buffer/Makefile src/plugins/burst_buffer/common/Makefile src/plugins/burst_buffer/datawarp/Makefile src/plugins/burst_buffer/generic/Makefile src/plugins/checkpoint/Makefile src/plugins/checkpoint/none/Makefile src/plugins/checkpoint/ompi/Makefile src/plugins/core_spec/Makefile src/plugins/core_spec/cray/Makefile src/plugins/core_spec/none/Makefile src/plugins/cred/Makefile src/plugins/cred/munge/Makefile src/plugins/cred/none/Makefile src/plugins/ext_sensors/Makefile src/plugins/ext_sensors/rrd/Makefile src/plugins/ext_sensors/none/Makefile src/plugins/gpu/Makefile src/plugins/gpu/generic/Makefile src/plugins/gpu/nvml/Makefile src/plugins/gres/Makefile src/plugins/gres/common/Makefile src/plugins/gres/gpu/Makefile src/plugins/gres/nic/Makefile src/plugins/gres/mic/Makefile src/plugins/gres/mps/Makefile src/plugins/jobacct_gather/Makefile src/plugins/jobacct_gather/common/Makefile src/plugins/jobacct_gather/linux/Makefile src/plugins/jobacct_gather/cgroup/Makefile src/plugins/jobacct_gather/none/Makefile src/plugins/jobcomp/Makefile src/plugins/jobcomp/elasticsearch/Makefile src/plugins/jobcomp/filetxt/Makefile src/plugins/jobcomp/none/Makefile src/plugins/jobcomp/script/Makefile src/plugins/jobcomp/mysql/Makefile src/plugins/job_container/Makefile src/plugins/job_container/cncu/Makefile src/plugins/job_container/none/Makefile src/plugins/job_submit/Makefile src/plugins/job_submit/all_partitions/Makefile src/plugins/job_submit/cray/Makefile src/plugins/job_submit/defaults/Makefile src/plugins/job_submit/logging/Makefile src/plugins/job_submit/lua/Makefile src/plugins/job_submit/partition/Makefile src/plugins/job_submit/pbs/Makefile src/plugins/job_submit/require_timelimit/Makefile src/plugins/job_submit/throttle/Makefile src/plugins/launch/Makefile src/plugins/launch/slurm/Makefile src/plugins/mcs/Makefile src/plugins/mcs/account/Makefile src/plugins/mcs/group/Makefile src/plugins/mcs/none/Makefile src/plugins/mcs/user/Makefile src/plugins/node_features/Makefile src/plugins/node_features/knl_cray/Makefile src/plugins/node_features/knl_generic/Makefile src/plugins/power/Makefile src/plugins/power/common/Makefile src/plugins/power/cray/Makefile src/plugins/power/none/Makefile src/plugins/preempt/Makefile src/plugins/preempt/none/Makefile src/plugins/preempt/partition_prio/Makefile src/plugins/preempt/qos/Makefile src/plugins/priority/Makefile src/plugins/priority/basic/Makefile src/plugins/priority/multifactor/Makefile src/plugins/proctrack/Makefile src/plugins/proctrack/cray/Makefile src/plugins/proctrack/cgroup/Makefile src/plugins/proctrack/pgid/Makefile src/plugins/proctrack/linuxproc/Makefile src/plugins/route/Makefile src/plugins/route/default/Makefile src/plugins/route/topology/Makefile src/plugins/sched/Makefile src/plugins/sched/backfill/Makefile src/plugins/sched/builtin/Makefile src/plugins/sched/hold/Makefile src/plugins/select/Makefile src/plugins/select/cons_res/Makefile src/plugins/select/cons_tres/Makefile src/plugins/select/cray/Makefile src/plugins/select/linear/Makefile src/plugins/select/other/Makefile src/plugins/site_factor/Makefile src/plugins/site_factor/none/Makefile src/plugins/slurmctld/Makefile src/plugins/slurmctld/nonstop/Makefile src/plugins/switch/Makefile src/plugins/switch/cray/Makefile src/plugins/switch/generic/Makefile src/plugins/switch/none/Makefile src/plugins/mpi/Makefile src/plugins/mpi/none/Makefile src/plugins/mpi/openmpi/Makefile src/plugins/mpi/pmi2/Makefile src/plugins/mpi/pmix/Makefile src/plugins/task/Makefile src/plugins/task/affinity/Makefile src/plugins/task/cgroup/Makefile src/plugins/task/cray/Makefile src/plugins/task/none/Makefile src/plugins/topology/Makefile src/plugins/topology/3d_torus/Makefile src/plugins/topology/hypercube/Makefile src/plugins/topology/node_rank/Makefile src/plugins/topology/none/Makefile src/plugins/topology/tree/Makefile testsuite/Makefile testsuite/expect/Makefile testsuite/slurm_unit/Makefile testsuite/slurm_unit/api/Makefile testsuite/slurm_unit/api/manual/Makefile testsuite/slurm_unit/common/Makefile testsuite/slurm_unit/common/slurm_protocol_pack/Makefile testsuite/slurm_unit/common/slurmdb_pack/Makefile"
+ac_config_files="$ac_config_files Makefile auxdir/Makefile contribs/Makefile contribs/cray/Makefile contribs/cray/csm/Makefile contribs/cray/slurmsmwd/Makefile contribs/lua/Makefile contribs/mic/Makefile contribs/pam/Makefile contribs/pam_slurm_adopt/Makefile contribs/perlapi/Makefile contribs/perlapi/libslurm/Makefile contribs/perlapi/libslurm/perl/Makefile.PL contribs/perlapi/libslurmdb/Makefile contribs/perlapi/libslurmdb/perl/Makefile.PL contribs/seff/Makefile contribs/torque/Makefile contribs/openlava/Makefile contribs/sgather/Makefile contribs/sgi/Makefile contribs/sjobexit/Makefile contribs/pmi/Makefile contribs/pmi2/Makefile doc/Makefile doc/man/Makefile doc/man/man1/Makefile doc/man/man3/Makefile doc/man/man5/Makefile doc/man/man8/Makefile doc/html/Makefile doc/html/configurator.html doc/html/configurator.easy.html etc/Makefile src/Makefile src/api/Makefile src/bcast/Makefile src/common/Makefile src/layouts/Makefile src/layouts/power/Makefile src/layouts/unit/Makefile src/database/Makefile src/sacct/Makefile src/sacctmgr/Makefile src/sreport/Makefile src/salloc/Makefile src/sbatch/Makefile src/sbcast/Makefile src/sattach/Makefile src/scancel/Makefile src/scontrol/Makefile src/sdiag/Makefile src/sinfo/Makefile src/slurmctld/Makefile src/slurmd/Makefile src/slurmd/common/Makefile src/slurmd/slurmd/Makefile src/slurmd/slurmstepd/Makefile src/slurmdbd/Makefile src/smap/Makefile src/sprio/Makefile src/squeue/Makefile src/srun/Makefile src/srun/libsrun/Makefile src/sshare/Makefile src/sstat/Makefile src/strigger/Makefile src/sview/Makefile src/plugins/Makefile src/plugins/accounting_storage/Makefile src/plugins/accounting_storage/common/Makefile src/plugins/accounting_storage/filetxt/Makefile src/plugins/accounting_storage/mysql/Makefile src/plugins/accounting_storage/none/Makefile src/plugins/accounting_storage/slurmdbd/Makefile src/plugins/acct_gather_energy/Makefile src/plugins/acct_gather_energy/cray_aries/Makefile src/plugins/acct_gather_energy/rapl/Makefile src/plugins/acct_gather_energy/ibmaem/Makefile src/plugins/acct_gather_energy/ipmi/Makefile src/plugins/acct_gather_energy/none/Makefile src/plugins/acct_gather_energy/xcc/Makefile src/plugins/acct_gather_interconnect/Makefile src/plugins/acct_gather_interconnect/ofed/Makefile src/plugins/acct_gather_interconnect/none/Makefile src/plugins/acct_gather_filesystem/Makefile src/plugins/acct_gather_filesystem/lustre/Makefile src/plugins/acct_gather_filesystem/none/Makefile src/plugins/acct_gather_profile/Makefile src/plugins/acct_gather_profile/hdf5/Makefile src/plugins/acct_gather_profile/hdf5/sh5util/Makefile src/plugins/acct_gather_profile/influxdb/Makefile src/plugins/acct_gather_profile/none/Makefile src/plugins/auth/Makefile src/plugins/auth/munge/Makefile src/plugins/auth/none/Makefile src/plugins/burst_buffer/Makefile src/plugins/burst_buffer/common/Makefile src/plugins/burst_buffer/datawarp/Makefile src/plugins/burst_buffer/generic/Makefile src/plugins/checkpoint/Makefile src/plugins/checkpoint/none/Makefile src/plugins/checkpoint/ompi/Makefile src/plugins/core_spec/Makefile src/plugins/core_spec/cray_aries/Makefile src/plugins/core_spec/none/Makefile src/plugins/cred/Makefile src/plugins/cred/munge/Makefile src/plugins/cred/none/Makefile src/plugins/ext_sensors/Makefile src/plugins/ext_sensors/rrd/Makefile src/plugins/ext_sensors/none/Makefile src/plugins/gpu/Makefile src/plugins/gpu/generic/Makefile src/plugins/gpu/nvml/Makefile src/plugins/gres/Makefile src/plugins/gres/common/Makefile src/plugins/gres/gpu/Makefile src/plugins/gres/nic/Makefile src/plugins/gres/mic/Makefile src/plugins/gres/mps/Makefile src/plugins/jobacct_gather/Makefile src/plugins/jobacct_gather/common/Makefile src/plugins/jobacct_gather/linux/Makefile src/plugins/jobacct_gather/cgroup/Makefile src/plugins/jobacct_gather/none/Makefile src/plugins/jobcomp/Makefile src/plugins/jobcomp/elasticsearch/Makefile src/plugins/jobcomp/filetxt/Makefile src/plugins/jobcomp/none/Makefile src/plugins/jobcomp/script/Makefile src/plugins/jobcomp/mysql/Makefile src/plugins/job_container/Makefile src/plugins/job_container/cncu/Makefile src/plugins/job_container/none/Makefile src/plugins/job_submit/Makefile src/plugins/job_submit/all_partitions/Makefile src/plugins/job_submit/cray_aries/Makefile src/plugins/job_submit/defaults/Makefile src/plugins/job_submit/logging/Makefile src/plugins/job_submit/lua/Makefile src/plugins/job_submit/partition/Makefile src/plugins/job_submit/pbs/Makefile src/plugins/job_submit/require_timelimit/Makefile src/plugins/job_submit/throttle/Makefile src/plugins/launch/Makefile src/plugins/launch/slurm/Makefile src/plugins/mcs/Makefile src/plugins/mcs/account/Makefile src/plugins/mcs/group/Makefile src/plugins/mcs/none/Makefile src/plugins/mcs/user/Makefile src/plugins/node_features/Makefile src/plugins/node_features/knl_cray/Makefile src/plugins/node_features/knl_generic/Makefile src/plugins/power/Makefile src/plugins/power/common/Makefile src/plugins/power/cray_aries/Makefile src/plugins/power/none/Makefile src/plugins/preempt/Makefile src/plugins/preempt/none/Makefile src/plugins/preempt/partition_prio/Makefile src/plugins/preempt/qos/Makefile src/plugins/priority/Makefile src/plugins/priority/basic/Makefile src/plugins/priority/multifactor/Makefile src/plugins/proctrack/Makefile src/plugins/proctrack/cray_aries/Makefile src/plugins/proctrack/cgroup/Makefile src/plugins/proctrack/pgid/Makefile src/plugins/proctrack/linuxproc/Makefile src/plugins/route/Makefile src/plugins/route/default/Makefile src/plugins/route/topology/Makefile src/plugins/sched/Makefile src/plugins/sched/backfill/Makefile src/plugins/sched/builtin/Makefile src/plugins/sched/hold/Makefile src/plugins/select/Makefile src/plugins/select/cons_res/Makefile src/plugins/select/cons_tres/Makefile src/plugins/select/cray_aries/Makefile src/plugins/select/linear/Makefile src/plugins/select/other/Makefile src/plugins/site_factor/Makefile src/plugins/site_factor/none/Makefile src/plugins/slurmctld/Makefile src/plugins/slurmctld/nonstop/Makefile src/plugins/switch/Makefile src/plugins/switch/cray_aries/Makefile src/plugins/switch/generic/Makefile src/plugins/switch/none/Makefile src/plugins/mpi/Makefile src/plugins/mpi/none/Makefile src/plugins/mpi/openmpi/Makefile src/plugins/mpi/pmi2/Makefile src/plugins/mpi/pmix/Makefile src/plugins/task/Makefile src/plugins/task/affinity/Makefile src/plugins/task/cgroup/Makefile src/plugins/task/cray_aries/Makefile src/plugins/task/none/Makefile src/plugins/topology/Makefile src/plugins/topology/3d_torus/Makefile src/plugins/topology/hypercube/Makefile src/plugins/topology/node_rank/Makefile src/plugins/topology/none/Makefile src/plugins/topology/tree/Makefile testsuite/Makefile testsuite/expect/Makefile testsuite/slurm_unit/Makefile testsuite/slurm_unit/api/Makefile testsuite/slurm_unit/api/manual/Makefile testsuite/slurm_unit/common/Makefile testsuite/slurm_unit/common/slurm_protocol_pack/Makefile testsuite/slurm_unit/common/slurmdb_pack/Makefile"
cat >confcache <<\_ACEOF
@@ -25885,7 +25885,7 @@ do
"src/plugins/accounting_storage/none/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/accounting_storage/none/Makefile" ;;
"src/plugins/accounting_storage/slurmdbd/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/accounting_storage/slurmdbd/Makefile" ;;
"src/plugins/acct_gather_energy/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/acct_gather_energy/Makefile" ;;
- "src/plugins/acct_gather_energy/cray/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/acct_gather_energy/cray/Makefile" ;;
+ "src/plugins/acct_gather_energy/cray_aries/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/acct_gather_energy/cray_aries/Makefile" ;;
"src/plugins/acct_gather_energy/rapl/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/acct_gather_energy/rapl/Makefile" ;;
"src/plugins/acct_gather_energy/ibmaem/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/acct_gather_energy/ibmaem/Makefile" ;;
"src/plugins/acct_gather_energy/ipmi/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/acct_gather_energy/ipmi/Makefile" ;;
@@ -25913,7 +25913,7 @@ do
"src/plugins/checkpoint/none/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/checkpoint/none/Makefile" ;;
"src/plugins/checkpoint/ompi/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/checkpoint/ompi/Makefile" ;;
"src/plugins/core_spec/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/core_spec/Makefile" ;;
- "src/plugins/core_spec/cray/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/core_spec/cray/Makefile" ;;
+ "src/plugins/core_spec/cray_aries/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/core_spec/cray_aries/Makefile" ;;
"src/plugins/core_spec/none/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/core_spec/none/Makefile" ;;
"src/plugins/cred/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/cred/Makefile" ;;
"src/plugins/cred/munge/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/cred/munge/Makefile" ;;
@@ -25946,7 +25946,7 @@ do
"src/plugins/job_container/none/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/job_container/none/Makefile" ;;
"src/plugins/job_submit/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/job_submit/Makefile" ;;
"src/plugins/job_submit/all_partitions/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/job_submit/all_partitions/Makefile" ;;
- "src/plugins/job_submit/cray/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/job_submit/cray/Makefile" ;;
+ "src/plugins/job_submit/cray_aries/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/job_submit/cray_aries/Makefile" ;;
"src/plugins/job_submit/defaults/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/job_submit/defaults/Makefile" ;;
"src/plugins/job_submit/logging/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/job_submit/logging/Makefile" ;;
"src/plugins/job_submit/lua/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/job_submit/lua/Makefile" ;;
@@ -25966,7 +25966,7 @@ do
"src/plugins/node_features/knl_generic/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/node_features/knl_generic/Makefile" ;;
"src/plugins/power/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/power/Makefile" ;;
"src/plugins/power/common/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/power/common/Makefile" ;;
- "src/plugins/power/cray/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/power/cray/Makefile" ;;
+ "src/plugins/power/cray_aries/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/power/cray_aries/Makefile" ;;
"src/plugins/power/none/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/power/none/Makefile" ;;
"src/plugins/preempt/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/preempt/Makefile" ;;
"src/plugins/preempt/none/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/preempt/none/Makefile" ;;
@@ -25976,7 +25976,7 @@ do
"src/plugins/priority/basic/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/priority/basic/Makefile" ;;
"src/plugins/priority/multifactor/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/priority/multifactor/Makefile" ;;
"src/plugins/proctrack/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/proctrack/Makefile" ;;
- "src/plugins/proctrack/cray/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/proctrack/cray/Makefile" ;;
+ "src/plugins/proctrack/cray_aries/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/proctrack/cray_aries/Makefile" ;;
"src/plugins/proctrack/cgroup/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/proctrack/cgroup/Makefile" ;;
"src/plugins/proctrack/pgid/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/proctrack/pgid/Makefile" ;;
"src/plugins/proctrack/linuxproc/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/proctrack/linuxproc/Makefile" ;;
@@ -25990,7 +25990,7 @@ do
"src/plugins/select/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/select/Makefile" ;;
"src/plugins/select/cons_res/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/select/cons_res/Makefile" ;;
"src/plugins/select/cons_tres/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/select/cons_tres/Makefile" ;;
- "src/plugins/select/cray/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/select/cray/Makefile" ;;
+ "src/plugins/select/cray_aries/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/select/cray_aries/Makefile" ;;
"src/plugins/select/linear/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/select/linear/Makefile" ;;
"src/plugins/select/other/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/select/other/Makefile" ;;
"src/plugins/site_factor/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/site_factor/Makefile" ;;
@@ -25998,7 +25998,7 @@ do
"src/plugins/slurmctld/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/slurmctld/Makefile" ;;
"src/plugins/slurmctld/nonstop/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/slurmctld/nonstop/Makefile" ;;
"src/plugins/switch/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/switch/Makefile" ;;
- "src/plugins/switch/cray/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/switch/cray/Makefile" ;;
+ "src/plugins/switch/cray_aries/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/switch/cray_aries/Makefile" ;;
"src/plugins/switch/generic/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/switch/generic/Makefile" ;;
"src/plugins/switch/none/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/switch/none/Makefile" ;;
"src/plugins/mpi/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/mpi/Makefile" ;;
@@ -26009,7 +26009,7 @@ do
"src/plugins/task/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/task/Makefile" ;;
"src/plugins/task/affinity/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/task/affinity/Makefile" ;;
"src/plugins/task/cgroup/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/task/cgroup/Makefile" ;;
- "src/plugins/task/cray/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/task/cray/Makefile" ;;
+ "src/plugins/task/cray_aries/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/task/cray_aries/Makefile" ;;
"src/plugins/task/none/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/task/none/Makefile" ;;
"src/plugins/topology/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/topology/Makefile" ;;
"src/plugins/topology/3d_torus/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/topology/3d_torus/Makefile" ;;
diff --git a/configure.ac b/configure.ac
index 016f2758881..a59482f8c48 100644
--- a/configure.ac
+++ b/configure.ac
@@ -447,7 +447,7 @@ AC_CONFIG_FILES([Makefile
src/plugins/accounting_storage/none/Makefile
src/plugins/accounting_storage/slurmdbd/Makefile
src/plugins/acct_gather_energy/Makefile
- src/plugins/acct_gather_energy/cray/Makefile
+ src/plugins/acct_gather_energy/cray_aries/Makefile
src/plugins/acct_gather_energy/rapl/Makefile
src/plugins/acct_gather_energy/ibmaem/Makefile
src/plugins/acct_gather_energy/ipmi/Makefile
@@ -475,7 +475,7 @@ AC_CONFIG_FILES([Makefile
src/plugins/checkpoint/none/Makefile
src/plugins/checkpoint/ompi/Makefile
src/plugins/core_spec/Makefile
- src/plugins/core_spec/cray/Makefile
+ src/plugins/core_spec/cray_aries/Makefile
src/plugins/core_spec/none/Makefile
src/plugins/cred/Makefile
src/plugins/cred/munge/Makefile
@@ -508,7 +508,7 @@ AC_CONFIG_FILES([Makefile
src/plugins/job_container/none/Makefile
src/plugins/job_submit/Makefile
src/plugins/job_submit/all_partitions/Makefile
- src/plugins/job_submit/cray/Makefile
+ src/plugins/job_submit/cray_aries/Makefile
src/plugins/job_submit/defaults/Makefile
src/plugins/job_submit/logging/Makefile
src/plugins/job_submit/lua/Makefile
@@ -528,7 +528,7 @@ AC_CONFIG_FILES([Makefile
src/plugins/node_features/knl_generic/Makefile
src/plugins/power/Makefile
src/plugins/power/common/Makefile
- src/plugins/power/cray/Makefile
+ src/plugins/power/cray_aries/Makefile
src/plugins/power/none/Makefile
src/plugins/preempt/Makefile
src/plugins/preempt/none/Makefile
@@ -538,7 +538,7 @@ AC_CONFIG_FILES([Makefile
src/plugins/priority/basic/Makefile
src/plugins/priority/multifactor/Makefile
src/plugins/proctrack/Makefile
- src/plugins/proctrack/cray/Makefile
+ src/plugins/proctrack/cray_aries/Makefile
src/plugins/proctrack/cgroup/Makefile
src/plugins/proctrack/pgid/Makefile
src/plugins/proctrack/linuxproc/Makefile
@@ -552,7 +552,7 @@ AC_CONFIG_FILES([Makefile
src/plugins/select/Makefile
src/plugins/select/cons_res/Makefile
src/plugins/select/cons_tres/Makefile
- src/plugins/select/cray/Makefile
+ src/plugins/select/cray_aries/Makefile
src/plugins/select/linear/Makefile
src/plugins/select/other/Makefile
src/plugins/site_factor/Makefile
@@ -560,7 +560,7 @@ AC_CONFIG_FILES([Makefile
src/plugins/slurmctld/Makefile
src/plugins/slurmctld/nonstop/Makefile
src/plugins/switch/Makefile
- src/plugins/switch/cray/Makefile
+ src/plugins/switch/cray_aries/Makefile
src/plugins/switch/generic/Makefile
src/plugins/switch/none/Makefile
src/plugins/mpi/Makefile
@@ -571,7 +571,7 @@ AC_CONFIG_FILES([Makefile
src/plugins/task/Makefile
src/plugins/task/affinity/Makefile
src/plugins/task/cgroup/Makefile
- src/plugins/task/cray/Makefile
+ src/plugins/task/cray_aries/Makefile
src/plugins/task/none/Makefile
src/plugins/topology/Makefile
src/plugins/topology/3d_torus/Makefile
diff --git a/src/common/gres.c b/src/common/gres.c
index c26d319843f..eed407b8fdf 100644
--- a/src/common/gres.c
+++ b/src/common/gres.c
@@ -10313,7 +10313,7 @@ extern void gres_plugin_job_merge(List from_job_gres_list,
char *select_type = slurm_get_select_type();
if (select_type &&
(strstr(select_type, "cons_tres") ||
- (strstr(select_type, "cray") &&
+ (strstr(select_type, "cray_aries") &&
(slurm_get_select_type_param() & CR_OTHER_CONS_TRES)))) {
select_hetero = 1;
} else
diff --git a/src/common/node_select.c b/src/common/node_select.c
index eeed1bd0ab3..b7a423fccb7 100644
--- a/src/common/node_select.c
+++ b/src/common/node_select.c
@@ -131,13 +131,13 @@ static char *_plugin_id2name(int plugin_id)
if (plugin_id == SELECT_PLUGIN_SERIAL)
return "serial";
if (plugin_id == SELECT_PLUGIN_CRAY_LINEAR)
- return "cray+linear";
+ return "cray_aries+linear";
if (plugin_id == SELECT_PLUGIN_CRAY_CONS_RES)
- return "cray+cons_res";
+ return "cray_aries+cons_res";
if (plugin_id == SELECT_PLUGIN_CONS_TRES)
return "cons_tres";
if (plugin_id == SELECT_PLUGIN_CRAY_CONS_TRES)
- return "cray+cons_tres";
+ return "cray_aries+cons_tres";
snprintf(id_str, sizeof(id_str), "%d", plugin_id);
return id_str;
}
@@ -197,10 +197,10 @@ extern int slurm_select_init(bool only_default)
/* just ignore warnings here */
} else {
#ifdef HAVE_NATIVE_CRAY
- if (xstrcasecmp(select_type, "select/cray")) {
- error("%s is incompatible with a native Cray system.",
+ if (xstrcasecmp(select_type, "select/cray_aries")) {
+ error("%s is incompatible with a Cray/Aries system.",
select_type);
- fatal("Use SelectType=select/cray");
+ fatal("Use SelectType=select/cray_aries");
}
#else
/* if (!xstrcasecmp(select_type, "select/cray")) { */
@@ -320,7 +320,7 @@ again:
((plugin_id == SELECT_PLUGIN_CRAY_CONS_RES) ||
(plugin_id == SELECT_PLUGIN_CRAY_CONS_TRES) ||
(plugin_id == SELECT_PLUGIN_CRAY_LINEAR))) {
- char *type = "select", *name = "select/cray";
+ char *type = "select", *name = "select/cray_aries";
uint16_t save_params = slurm_get_select_type_param();
uint16_t params[2];
int cray_plugin_id[2], cray_offset;
diff --git a/src/common/read_config.c b/src/common/read_config.c
index ad6f758822a..5bd10d3d125 100644
--- a/src/common/read_config.c
+++ b/src/common/read_config.c
@@ -4047,7 +4047,7 @@ _validate_and_set_defaults(slurm_ctl_conf_t *conf, s_p_hashtbl_t *hashtbl)
#if defined(HAVE_NATIVE_CRAY)
if (conf->mpi_params == NULL ||
strstr(conf->mpi_params, "ports=") == NULL) {
- error("MpiParams=ports= is required on native Cray systems");
+ error("MpiParams=ports= is required on Cray/Aries systems");
return SLURM_ERROR;
}
#endif
@@ -4467,8 +4467,8 @@ _validate_and_set_defaults(slurm_ctl_conf_t *conf, s_p_hashtbl_t *hashtbl)
conf->proctrack_type = xstrdup(DEFAULT_PROCTRACK_TYPE);
}
#ifdef HAVE_NATIVE_CRAY
- if (xstrcmp(conf->proctrack_type, "proctrack/cray")) {
- error("On a native Cray ProctrackType=proctrack/cray "
+ if (xstrcmp(conf->proctrack_type, "proctrack/cray_aries")) {
+ error("On a Cray/Aries ProctrackType=proctrack/cray_aries "
"is required");
return SLURM_ERROR;
}
@@ -4647,7 +4647,7 @@ _validate_and_set_defaults(slurm_ctl_conf_t *conf, s_p_hashtbl_t *hashtbl)
* to access the needed libraries.
*/
if (conf->slurm_user_id != 0) {
- error("Cray requires SlurmUser=root (default), but have '%s'.",
+ error("Cray/Aries requires SlurmUser=root (default), but have '%s'.",
conf->slurm_user_name);
return SLURM_ERROR;
}
@@ -4934,9 +4934,9 @@ _validate_and_set_defaults(slurm_ctl_conf_t *conf, s_p_hashtbl_t *hashtbl)
return SLURM_ERROR;
}
} else if (xstrcasecmp(tok, "SlurmdOffSpec") == 0) {
- if (xstrcasestr(conf->task_plugin, "cray")) {
- error("TaskPluginParam=SlurmdOffSpec "
- "invalid with TaskPlugin=task/cray");
+ if (xstrcasestr(conf->task_plugin,
+ "cray_aries")) {
+ error("TaskPluginParam=SlurmdOffSpec invalid with TaskPlugin=task/cray_aries");
return SLURM_ERROR;
}
conf->task_plugin_param |= SLURMD_OFF_SPEC;
diff --git a/src/common/read_config.h b/src/common/read_config.h
index 595570d61f9..eb17e87d925 100644
--- a/src/common/read_config.h
+++ b/src/common/read_config.h
@@ -144,7 +144,7 @@ extern uint16_t drop_priv_flag;
#define DEFAULT_SCHED_TIME_SLICE 30
#define DEFAULT_SCHEDTYPE "sched/backfill"
#if defined HAVE_NATIVE_CRAY
-# define DEFAULT_SELECT_TYPE "select/cray"
+# define DEFAULT_SELECT_TYPE "select/cray_aries"
#else
# define DEFAULT_SELECT_TYPE "select/linear"
#endif
@@ -163,7 +163,7 @@ extern uint16_t drop_priv_flag;
#define DEFAULT_SUSPEND_TIME 0
#define DEFAULT_SUSPEND_TIMEOUT 30
#if defined HAVE_NATIVE_CRAY
-# define DEFAULT_SWITCH_TYPE "switch/cray"
+# define DEFAULT_SWITCH_TYPE "switch/cray_aries"
#else
# define DEFAULT_SWITCH_TYPE "switch/none"
#endif
diff --git a/src/common/slurm_protocol_api.c b/src/common/slurm_protocol_api.c
index 73b40ea0fe1..8410993447b 100644
--- a/src/common/slurm_protocol_api.c
+++ b/src/common/slurm_protocol_api.c
@@ -2857,7 +2857,7 @@ void slurm_set_select_type_param(uint16_t select_type_param)
}
}
-/** Return true if (remote) system runs Cray XT/XE */
+/** Return true if (remote) system runs Cray Aries */
bool is_cray_select_type(void)
{
bool result = false;
@@ -2865,7 +2865,7 @@ bool is_cray_select_type(void)
if (slurmdbd_conf) {
} else {
slurm_ctl_conf_t *conf = slurm_conf_lock();
- result = xstrcasecmp(conf->select_type, "select/cray") == 0;
+ result = !xstrcasecmp(conf->select_type, "select/cray_aries");
slurm_conf_unlock();
}
return result;
diff --git a/src/plugins/acct_gather_energy/Makefile.am b/src/plugins/acct_gather_energy/Makefile.am
index 220ee5f044c..50c4fd36a2e 100644
--- a/src/plugins/acct_gather_energy/Makefile.am
+++ b/src/plugins/acct_gather_energy/Makefile.am
@@ -1,3 +1,3 @@
# Makefile for accounting gather energy plugins
-SUBDIRS = cray rapl ibmaem ipmi none xcc
+SUBDIRS = cray_aries rapl ibmaem ipmi none xcc
diff --git a/src/plugins/acct_gather_energy/Makefile.in b/src/plugins/acct_gather_energy/Makefile.in
index 6faea8d90b9..c4b1d2b625a 100644
--- a/src/plugins/acct_gather_energy/Makefile.in
+++ b/src/plugins/acct_gather_energy/Makefile.in
@@ -470,7 +470,7 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-SUBDIRS = cray rapl ibmaem ipmi none xcc
+SUBDIRS = cray_aries rapl ibmaem ipmi none xcc
all: all-recursive
.SUFFIXES:
diff --git a/src/plugins/acct_gather_energy/cray/Makefile.am b/src/plugins/acct_gather_energy/cray/Makefile.am
deleted file mode 100644
index 7aa6572fd7a..00000000000
--- a/src/plugins/acct_gather_energy/cray/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-# Makefile for acct_gather_energy/cray plugin
-
-AUTOMAKE_OPTIONS = foreign
-
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
-
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common
-
-pkglib_LTLIBRARIES = acct_gather_energy_cray.la
-
-# cpu/core energy accounting plugin.
-acct_gather_energy_cray_la_SOURCES = acct_gather_energy_cray.c
-
-acct_gather_energy_cray_la_LDFLAGS = $(PLUGIN_FLAGS)
-acct_gather_energy_cray_la_LIBADD = -lm
diff --git a/src/plugins/acct_gather_energy/cray_aries/Makefile.am b/src/plugins/acct_gather_energy/cray_aries/Makefile.am
new file mode 100644
index 00000000000..147471ad9bd
--- /dev/null
+++ b/src/plugins/acct_gather_energy/cray_aries/Makefile.am
@@ -0,0 +1,15 @@
+# Makefile for acct_gather_energy/cray_aries plugin
+
+AUTOMAKE_OPTIONS = foreign
+
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common
+
+pkglib_LTLIBRARIES = acct_gather_energy_cray_aries.la
+
+# cpu/core energy accounting plugin.
+acct_gather_energy_cray_aries_la_SOURCES = acct_gather_energy_cray_aries.c
+
+acct_gather_energy_cray_aries_la_LDFLAGS = $(PLUGIN_FLAGS)
+acct_gather_energy_cray_aries_la_LIBADD = -lm
diff --git a/src/plugins/acct_gather_energy/cray/Makefile.in b/src/plugins/acct_gather_energy/cray_aries/Makefile.in
similarity index 94%
rename from src/plugins/acct_gather_energy/cray/Makefile.in
rename to src/plugins/acct_gather_energy/cray_aries/Makefile.in
index 0de9778b178..8875b31c649 100644
--- a/src/plugins/acct_gather_energy/cray/Makefile.in
+++ b/src/plugins/acct_gather_energy/cray_aries/Makefile.in
@@ -14,7 +14,7 @@
@SET_MAKE@
-# Makefile for acct_gather_energy/cray plugin
+# Makefile for acct_gather_energy/cray_aries plugin
VPATH = @srcdir@
am__is_gnu_make = { \
@@ -91,7 +91,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-subdir = src/plugins/acct_gather_energy/cray
+subdir = src/plugins/acct_gather_energy/cray_aries
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/auxdir/ax_check_compile_flag.m4 \
$(top_srcdir)/auxdir/ax_check_zlib.m4 \
@@ -174,18 +174,19 @@ am__uninstall_files_from_dir = { \
}
am__installdirs = "$(DESTDIR)$(pkglibdir)"
LTLIBRARIES = $(pkglib_LTLIBRARIES)
-acct_gather_energy_cray_la_DEPENDENCIES =
-am_acct_gather_energy_cray_la_OBJECTS = acct_gather_energy_cray.lo
-acct_gather_energy_cray_la_OBJECTS = \
- $(am_acct_gather_energy_cray_la_OBJECTS)
+acct_gather_energy_cray_aries_la_DEPENDENCIES =
+am_acct_gather_energy_cray_aries_la_OBJECTS = \
+ acct_gather_energy_cray_aries.lo
+acct_gather_energy_cray_aries_la_OBJECTS = \
+ $(am_acct_gather_energy_cray_aries_la_OBJECTS)
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
am__v_lt_1 =
-acct_gather_energy_cray_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+acct_gather_energy_cray_aries_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
- $(AM_CFLAGS) $(CFLAGS) $(acct_gather_energy_cray_la_LDFLAGS) \
- $(LDFLAGS) -o $@
+ $(AM_CFLAGS) $(CFLAGS) \
+ $(acct_gather_energy_cray_aries_la_LDFLAGS) $(LDFLAGS) -o $@
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
am__v_P_0 = false
@@ -201,7 +202,7 @@ am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/slurm
depcomp = $(SHELL) $(top_srcdir)/auxdir/depcomp
am__maybe_remake_depfiles = depfiles
-am__depfiles_remade = ./$(DEPDIR)/acct_gather_energy_cray.Plo
+am__depfiles_remade = ./$(DEPDIR)/acct_gather_energy_cray_aries.Plo
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -221,8 +222,8 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
am__v_CCLD_0 = @echo " CCLD " $@;
am__v_CCLD_1 =
-SOURCES = $(acct_gather_energy_cray_la_SOURCES)
-DIST_SOURCES = $(acct_gather_energy_cray_la_SOURCES)
+SOURCES = $(acct_gather_energy_cray_aries_la_SOURCES)
+DIST_SOURCES = $(acct_gather_energy_cray_aries_la_SOURCES)
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
@@ -496,12 +497,12 @@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
PLUGIN_FLAGS = -module -avoid-version --export-dynamic
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common
-pkglib_LTLIBRARIES = acct_gather_energy_cray.la
+pkglib_LTLIBRARIES = acct_gather_energy_cray_aries.la
# cpu/core energy accounting plugin.
-acct_gather_energy_cray_la_SOURCES = acct_gather_energy_cray.c
-acct_gather_energy_cray_la_LDFLAGS = $(PLUGIN_FLAGS)
-acct_gather_energy_cray_la_LIBADD = -lm
+acct_gather_energy_cray_aries_la_SOURCES = acct_gather_energy_cray_aries.c
+acct_gather_energy_cray_aries_la_LDFLAGS = $(PLUGIN_FLAGS)
+acct_gather_energy_cray_aries_la_LIBADD = -lm
all: all-am
.SUFFIXES:
@@ -515,9 +516,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/acct_gather_energy/cray/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/acct_gather_energy/cray_aries/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign src/plugins/acct_gather_energy/cray/Makefile
+ $(AUTOMAKE) --foreign src/plugins/acct_gather_energy/cray_aries/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -571,8 +572,8 @@ clean-pkglibLTLIBRARIES:
rm -f $${locs}; \
}
-acct_gather_energy_cray.la: $(acct_gather_energy_cray_la_OBJECTS) $(acct_gather_energy_cray_la_DEPENDENCIES) $(EXTRA_acct_gather_energy_cray_la_DEPENDENCIES)
- $(AM_V_CCLD)$(acct_gather_energy_cray_la_LINK) -rpath $(pkglibdir) $(acct_gather_energy_cray_la_OBJECTS) $(acct_gather_energy_cray_la_LIBADD) $(LIBS)
+acct_gather_energy_cray_aries.la: $(acct_gather_energy_cray_aries_la_OBJECTS) $(acct_gather_energy_cray_aries_la_DEPENDENCIES) $(EXTRA_acct_gather_energy_cray_aries_la_DEPENDENCIES)
+ $(AM_V_CCLD)$(acct_gather_energy_cray_aries_la_LINK) -rpath $(pkglibdir) $(acct_gather_energy_cray_aries_la_OBJECTS) $(acct_gather_energy_cray_aries_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -580,7 +581,7 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acct_gather_energy_cray.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acct_gather_energy_cray_aries.Plo@am__quote@ # am--include-marker
$(am__depfiles_remade):
@$(MKDIR_P) $(@D)
@@ -743,7 +744,7 @@ clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
mostlyclean-am
distclean: distclean-am
- -rm -f ./$(DEPDIR)/acct_gather_energy_cray.Plo
+ -rm -f ./$(DEPDIR)/acct_gather_energy_cray_aries.Plo
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -789,7 +790,7 @@ install-ps-am:
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -f ./$(DEPDIR)/acct_gather_energy_cray.Plo
+ -rm -f ./$(DEPDIR)/acct_gather_energy_cray_aries.Plo
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
diff --git a/src/plugins/acct_gather_energy/cray/acct_gather_energy_cray.c b/src/plugins/acct_gather_energy/cray_aries/acct_gather_energy_cray_aries.c
similarity index 97%
rename from src/plugins/acct_gather_energy/cray/acct_gather_energy_cray.c
rename to src/plugins/acct_gather_energy/cray_aries/acct_gather_energy_cray_aries.c
index 84a0a5f44ae..b2d43d63552 100644
--- a/src/plugins/acct_gather_energy/cray/acct_gather_energy_cray.c
+++ b/src/plugins/acct_gather_energy/cray_aries/acct_gather_energy_cray_aries.c
@@ -1,5 +1,6 @@
/*****************************************************************************\
- * acct_gather_energy_cray.c - slurm energy accounting plugin for cray.
+ * acct_gather_energy_cray_aries.c - slurm energy accounting plugin for
+ * Cray/Aries.
*****************************************************************************
* Copyright (C) 2015 SchedMD LLC
* Written by Danny Auble <da@schedmd.com> who borrowed from the rapl
@@ -36,7 +37,7 @@
*
\*****************************************************************************/
-/* acct_gather_energy_cray
+/* acct_gather_energy_cray_aries
* This plugin does not initiate a node-level thread.
* It will be used to get energy values from the cray bmc when available
*/
@@ -71,8 +72,8 @@
* plugin_version - an unsigned 32-bit integer containing the Slurm version
* (major.minor.micro combined into a single number).
*/
-const char plugin_name[] = "AcctGatherEnergy CRAY plugin";
-const char plugin_type[] = "acct_gather_energy/cray";
+const char plugin_name[] = "AcctGatherEnergy Cray/Aries plugin";
+const char plugin_type[] = "acct_gather_energy/cray_aries";
const uint32_t plugin_version = SLURM_VERSION_NUMBER;
static acct_gather_energy_t *local_energy = NULL;
diff --git a/src/plugins/core_spec/Makefile.am b/src/plugins/core_spec/Makefile.am
index c88a776c95c..44b1ed67c07 100644
--- a/src/plugins/core_spec/Makefile.am
+++ b/src/plugins/core_spec/Makefile.am
@@ -1,3 +1,3 @@
# Makefile for core specialization plugins
-SUBDIRS = cray none
+SUBDIRS = cray_aries none
diff --git a/src/plugins/core_spec/Makefile.in b/src/plugins/core_spec/Makefile.in
index a58e3ee159b..5c40fa4de76 100644
--- a/src/plugins/core_spec/Makefile.in
+++ b/src/plugins/core_spec/Makefile.in
@@ -470,7 +470,7 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-SUBDIRS = cray none
+SUBDIRS = cray_aries none
all: all-recursive
.SUFFIXES:
diff --git a/src/plugins/core_spec/cray/Makefile.am b/src/plugins/core_spec/cray/Makefile.am
deleted file mode 100644
index dfe2f69dea4..00000000000
--- a/src/plugins/core_spec/cray/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-# Makefile for core_spec/cray plugin
-
-AUTOMAKE_OPTIONS = foreign
-
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
-
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common
-
-pkglib_LTLIBRARIES = core_spec_cray.la
-
-# Cray core specialization plugin.
-core_spec_cray_la_SOURCES = core_spec_cray.c
-core_spec_cray_la_CPPFLAGS = $(CRAY_JOB_CPPFLAGS) $(AM_CPPFLAGS)
-core_spec_cray_la_LDFLAGS = $(CRAY_JOB_LDFLAGS) $(PLUGIN_FLAGS)
diff --git a/src/plugins/core_spec/cray_aries/Makefile.am b/src/plugins/core_spec/cray_aries/Makefile.am
new file mode 100644
index 00000000000..060023fb537
--- /dev/null
+++ b/src/plugins/core_spec/cray_aries/Makefile.am
@@ -0,0 +1,14 @@
+# Makefile for core_spec/cray_aries plugin
+
+AUTOMAKE_OPTIONS = foreign
+
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common
+
+pkglib_LTLIBRARIES = core_spec_cray_aries.la
+
+# Cray/Aries core specialization plugin.
+core_spec_cray_aries_la_SOURCES = core_spec_cray_aries.c
+core_spec_cray_aries_la_CPPFLAGS = $(CRAY_JOB_CPPFLAGS) $(AM_CPPFLAGS)
+core_spec_cray_aries_la_LDFLAGS = $(CRAY_JOB_LDFLAGS) $(PLUGIN_FLAGS)
diff --git a/src/plugins/core_spec/cray/Makefile.in b/src/plugins/core_spec/cray_aries/Makefile.in
similarity index 91%
rename from src/plugins/core_spec/cray/Makefile.in
rename to src/plugins/core_spec/cray_aries/Makefile.in
index 93f412665d7..74014311fa2 100644
--- a/src/plugins/core_spec/cray/Makefile.in
+++ b/src/plugins/core_spec/cray_aries/Makefile.in
@@ -14,7 +14,7 @@
@SET_MAKE@
-# Makefile for core_spec/cray plugin
+# Makefile for core_spec/cray_aries plugin
VPATH = @srcdir@
am__is_gnu_make = { \
@@ -91,7 +91,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-subdir = src/plugins/core_spec/cray
+subdir = src/plugins/core_spec/cray_aries
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/auxdir/ax_check_compile_flag.m4 \
$(top_srcdir)/auxdir/ax_check_zlib.m4 \
@@ -174,17 +174,19 @@ am__uninstall_files_from_dir = { \
}
am__installdirs = "$(DESTDIR)$(pkglibdir)"
LTLIBRARIES = $(pkglib_LTLIBRARIES)
-core_spec_cray_la_LIBADD =
-am_core_spec_cray_la_OBJECTS = core_spec_cray_la-core_spec_cray.lo
-core_spec_cray_la_OBJECTS = $(am_core_spec_cray_la_OBJECTS)
+core_spec_cray_aries_la_LIBADD =
+am_core_spec_cray_aries_la_OBJECTS = \
+ core_spec_cray_aries_la-core_spec_cray_aries.lo
+core_spec_cray_aries_la_OBJECTS = \
+ $(am_core_spec_cray_aries_la_OBJECTS)
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
am__v_lt_1 =
-core_spec_cray_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+core_spec_cray_aries_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
- $(AM_CFLAGS) $(CFLAGS) $(core_spec_cray_la_LDFLAGS) $(LDFLAGS) \
- -o $@
+ $(AM_CFLAGS) $(CFLAGS) $(core_spec_cray_aries_la_LDFLAGS) \
+ $(LDFLAGS) -o $@
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
am__v_P_0 = false
@@ -201,7 +203,7 @@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/slurm
depcomp = $(SHELL) $(top_srcdir)/auxdir/depcomp
am__maybe_remake_depfiles = depfiles
am__depfiles_remade = \
- ./$(DEPDIR)/core_spec_cray_la-core_spec_cray.Plo
+ ./$(DEPDIR)/core_spec_cray_aries_la-core_spec_cray_aries.Plo
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -221,8 +223,8 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
am__v_CCLD_0 = @echo " CCLD " $@;
am__v_CCLD_1 =
-SOURCES = $(core_spec_cray_la_SOURCES)
-DIST_SOURCES = $(core_spec_cray_la_SOURCES)
+SOURCES = $(core_spec_cray_aries_la_SOURCES)
+DIST_SOURCES = $(core_spec_cray_aries_la_SOURCES)
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
@@ -496,12 +498,12 @@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
PLUGIN_FLAGS = -module -avoid-version --export-dynamic
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common
-pkglib_LTLIBRARIES = core_spec_cray.la
+pkglib_LTLIBRARIES = core_spec_cray_aries.la
-# Cray core specialization plugin.
-core_spec_cray_la_SOURCES = core_spec_cray.c
-core_spec_cray_la_CPPFLAGS = $(CRAY_JOB_CPPFLAGS) $(AM_CPPFLAGS)
-core_spec_cray_la_LDFLAGS = $(CRAY_JOB_LDFLAGS) $(PLUGIN_FLAGS)
+# Cray/Aries core specialization plugin.
+core_spec_cray_aries_la_SOURCES = core_spec_cray_aries.c
+core_spec_cray_aries_la_CPPFLAGS = $(CRAY_JOB_CPPFLAGS) $(AM_CPPFLAGS)
+core_spec_cray_aries_la_LDFLAGS = $(CRAY_JOB_LDFLAGS) $(PLUGIN_FLAGS)
all: all-am
.SUFFIXES:
@@ -515,9 +517,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/core_spec/cray/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/core_spec/cray_aries/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign src/plugins/core_spec/cray/Makefile
+ $(AUTOMAKE) --foreign src/plugins/core_spec/cray_aries/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -571,8 +573,8 @@ clean-pkglibLTLIBRARIES:
rm -f $${locs}; \
}
-core_spec_cray.la: $(core_spec_cray_la_OBJECTS) $(core_spec_cray_la_DEPENDENCIES) $(EXTRA_core_spec_cray_la_DEPENDENCIES)
- $(AM_V_CCLD)$(core_spec_cray_la_LINK) -rpath $(pkglibdir) $(core_spec_cray_la_OBJECTS) $(core_spec_cray_la_LIBADD) $(LIBS)
+core_spec_cray_aries.la: $(core_spec_cray_aries_la_OBJECTS) $(core_spec_cray_aries_la_DEPENDENCIES) $(EXTRA_core_spec_cray_aries_la_DEPENDENCIES)
+ $(AM_V_CCLD)$(core_spec_cray_aries_la_LINK) -rpath $(pkglibdir) $(core_spec_cray_aries_la_OBJECTS) $(core_spec_cray_aries_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -580,7 +582,7 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/core_spec_cray_la-core_spec_cray.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/core_spec_cray_aries_la-core_spec_cray_aries.Plo@am__quote@ # am--include-marker
$(am__depfiles_remade):
@$(MKDIR_P) $(@D)
@@ -609,12 +611,12 @@ am--depfiles: $(am__depfiles_remade)
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
-core_spec_cray_la-core_spec_cray.lo: core_spec_cray.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(core_spec_cray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT core_spec_cray_la-core_spec_cray.lo -MD -MP -MF $(DEPDIR)/core_spec_cray_la-core_spec_cray.Tpo -c -o core_spec_cray_la-core_spec_cray.lo `test -f 'core_spec_cray.c' || echo '$(srcdir)/'`core_spec_cray.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/core_spec_cray_la-core_spec_cray.Tpo $(DEPDIR)/core_spec_cray_la-core_spec_cray.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='core_spec_cray.c' object='core_spec_cray_la-core_spec_cray.lo' libtool=yes @AMDEPBACKSLASH@
+core_spec_cray_aries_la-core_spec_cray_aries.lo: core_spec_cray_aries.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(core_spec_cray_aries_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT core_spec_cray_aries_la-core_spec_cray_aries.lo -MD -MP -MF $(DEPDIR)/core_spec_cray_aries_la-core_spec_cray_aries.Tpo -c -o core_spec_cray_aries_la-core_spec_cray_aries.lo `test -f 'core_spec_cray_aries.c' || echo '$(srcdir)/'`core_spec_cray_aries.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/core_spec_cray_aries_la-core_spec_cray_aries.Tpo $(DEPDIR)/core_spec_cray_aries_la-core_spec_cray_aries.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='core_spec_cray_aries.c' object='core_spec_cray_aries_la-core_spec_cray_aries.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(core_spec_cray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o core_spec_cray_la-core_spec_cray.lo `test -f 'core_spec_cray.c' || echo '$(srcdir)/'`core_spec_cray.c
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(core_spec_cray_aries_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o core_spec_cray_aries_la-core_spec_cray_aries.lo `test -f 'core_spec_cray_aries.c' || echo '$(srcdir)/'`core_spec_cray_aries.c
mostlyclean-libtool:
-rm -f *.lo
@@ -750,7 +752,7 @@ clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
mostlyclean-am
distclean: distclean-am
- -rm -f ./$(DEPDIR)/core_spec_cray_la-core_spec_cray.Plo
+ -rm -f ./$(DEPDIR)/core_spec_cray_aries_la-core_spec_cray_aries.Plo
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -796,7 +798,7 @@ install-ps-am:
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -f ./$(DEPDIR)/core_spec_cray_la-core_spec_cray.Plo
+ -rm -f ./$(DEPDIR)/core_spec_cray_aries_la-core_spec_cray_aries.Plo
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
diff --git a/src/plugins/core_spec/cray/core_spec_cray.c b/src/plugins/core_spec/cray_aries/core_spec_cray_aries.c
similarity index 97%
rename from src/plugins/core_spec/cray/core_spec_cray.c
rename to src/plugins/core_spec/cray_aries/core_spec_cray_aries.c
index 93f62166d5a..d31974e59b5 100644
--- a/src/plugins/core_spec/cray/core_spec_cray.c
+++ b/src/plugins/core_spec/cray_aries/core_spec_cray_aries.c
@@ -1,5 +1,5 @@
/*****************************************************************************\
- * core_spec_cray.c - Cray core specialization plugin.
+ * core_spec_cray_aries.c - Cray/Aries core specialization plugin.
*****************************************************************************
* Copyright (C) 2014-2015 SchedMD LLC
* Written by Morris Jette <jette@schemd.com>
@@ -79,8 +79,8 @@
* plugin_version - an unsigned 32-bit integer containing the Slurm version
* (major.minor.micro combined into a single number).
*/
-const char plugin_name[] = "Cray core specialization plugin";
-const char plugin_type[] = "core_spec/cray";
+const char plugin_name[] = "Cray/Aries core specialization plugin";
+const char plugin_type[] = "core_spec/cray_aries";
const uint32_t plugin_version = SLURM_VERSION_NUMBER;
static uint64_t debug_flags = 0;
diff --git a/src/plugins/job_submit/Makefile.am b/src/plugins/job_submit/Makefile.am
index 3376e2fe272..e393bcfb1cc 100644
--- a/src/plugins/job_submit/Makefile.am
+++ b/src/plugins/job_submit/Makefile.am
@@ -2,7 +2,7 @@
SUBDIRS = \
all_partitions \
- cray \
+ cray_aries \
defaults \
logging \
lua \
diff --git a/src/plugins/job_submit/Makefile.in b/src/plugins/job_submit/Makefile.in
index bc7d078888f..78932012528 100644
--- a/src/plugins/job_submit/Makefile.in
+++ b/src/plugins/job_submit/Makefile.in
@@ -472,7 +472,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = \
all_partitions \
- cray \
+ cray_aries \
defaults \
logging \
lua \
diff --git a/src/plugins/job_submit/cray/Makefile.am b/src/plugins/job_submit/cray/Makefile.am
deleted file mode 100644
index 6fac8b54e75..00000000000
--- a/src/plugins/job_submit/cray/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-# Makefile for job_submit/cray plugin
-
-AUTOMAKE_OPTIONS = foreign
-
-AM_CPPFLAGS = -DDEFAULT_SCRIPT_DIR=\"$(sysconfdir)\" \
- -I$(top_srcdir) -I$(top_srcdir)/src/common
-
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
-
-pkglib_LTLIBRARIES = job_submit_cray.la
-job_submit_cray_la_SOURCES = job_submit_cray.c
-job_submit_cray_la_LDFLAGS = $(PLUGIN_FLAGS)
-
diff --git a/src/plugins/job_submit/cray_aries/Makefile.am b/src/plugins/job_submit/cray_aries/Makefile.am
new file mode 100644
index 00000000000..2d04c44ca0b
--- /dev/null
+++ b/src/plugins/job_submit/cray_aries/Makefile.am
@@ -0,0 +1,13 @@
+# Makefile for job_submit/cray_aries plugin
+
+AUTOMAKE_OPTIONS = foreign
+
+AM_CPPFLAGS = -DDEFAULT_SCRIPT_DIR=\"$(sysconfdir)\" \
+ -I$(top_srcdir) -I$(top_srcdir)/src/common
+
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+
+pkglib_LTLIBRARIES = job_submit_cray_aries.la
+job_submit_cray_aries_la_SOURCES = job_submit_cray_aries.c
+job_submit_cray_aries_la_LDFLAGS = $(PLUGIN_FLAGS)
+
diff --git a/src/plugins/job_submit/cray/Makefile.in b/src/plugins/job_submit/cray_aries/Makefile.in
similarity index 95%
rename from src/plugins/job_submit/cray/Makefile.in
rename to src/plugins/job_submit/cray_aries/Makefile.in
index ceeb8aa946e..2b5de3a33f8 100644
--- a/src/plugins/job_submit/cray/Makefile.in
+++ b/src/plugins/job_submit/cray_aries/Makefile.in
@@ -14,7 +14,7 @@
@SET_MAKE@
-# Makefile for job_submit/cray plugin
+# Makefile for job_submit/cray_aries plugin
VPATH = @srcdir@
am__is_gnu_make = { \
@@ -91,7 +91,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-subdir = src/plugins/job_submit/cray
+subdir = src/plugins/job_submit/cray_aries
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/auxdir/ax_check_compile_flag.m4 \
$(top_srcdir)/auxdir/ax_check_zlib.m4 \
@@ -174,16 +174,17 @@ am__uninstall_files_from_dir = { \
}
am__installdirs = "$(DESTDIR)$(pkglibdir)"
LTLIBRARIES = $(pkglib_LTLIBRARIES)
-job_submit_cray_la_LIBADD =
-am_job_submit_cray_la_OBJECTS = job_submit_cray.lo
-job_submit_cray_la_OBJECTS = $(am_job_submit_cray_la_OBJECTS)
+job_submit_cray_aries_la_LIBADD =
+am_job_submit_cray_aries_la_OBJECTS = job_submit_cray_aries.lo
+job_submit_cray_aries_la_OBJECTS = \
+ $(am_job_submit_cray_aries_la_OBJECTS)
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
am__v_lt_1 =
-job_submit_cray_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+job_submit_cray_aries_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
- $(AM_CFLAGS) $(CFLAGS) $(job_submit_cray_la_LDFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS) $(job_submit_cray_aries_la_LDFLAGS) \
$(LDFLAGS) -o $@
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -200,7 +201,7 @@ am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/slurm
depcomp = $(SHELL) $(top_srcdir)/auxdir/depcomp
am__maybe_remake_depfiles = depfiles
-am__depfiles_remade = ./$(DEPDIR)/job_submit_cray.Plo
+am__depfiles_remade = ./$(DEPDIR)/job_submit_cray_aries.Plo
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -220,8 +221,8 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
am__v_CCLD_0 = @echo " CCLD " $@;
am__v_CCLD_1 =
-SOURCES = $(job_submit_cray_la_SOURCES)
-DIST_SOURCES = $(job_submit_cray_la_SOURCES)
+SOURCES = $(job_submit_cray_aries_la_SOURCES)
+DIST_SOURCES = $(job_submit_cray_aries_la_SOURCES)
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
@@ -497,9 +498,9 @@ AM_CPPFLAGS = -DDEFAULT_SCRIPT_DIR=\"$(sysconfdir)\" \
-I$(top_srcdir) -I$(top_srcdir)/src/common
PLUGIN_FLAGS = -module -avoid-version --export-dynamic
-pkglib_LTLIBRARIES = job_submit_cray.la
-job_submit_cray_la_SOURCES = job_submit_cray.c
-job_submit_cray_la_LDFLAGS = $(PLUGIN_FLAGS)
+pkglib_LTLIBRARIES = job_submit_cray_aries.la
+job_submit_cray_aries_la_SOURCES = job_submit_cray_aries.c
+job_submit_cray_aries_la_LDFLAGS = $(PLUGIN_FLAGS)
all: all-am
.SUFFIXES:
@@ -513,9 +514,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/job_submit/cray/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/job_submit/cray_aries/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign src/plugins/job_submit/cray/Makefile
+ $(AUTOMAKE) --foreign src/plugins/job_submit/cray_aries/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -569,8 +570,8 @@ clean-pkglibLTLIBRARIES:
rm -f $${locs}; \
}
-job_submit_cray.la: $(job_submit_cray_la_OBJECTS) $(job_submit_cray_la_DEPENDENCIES) $(EXTRA_job_submit_cray_la_DEPENDENCIES)
- $(AM_V_CCLD)$(job_submit_cray_la_LINK) -rpath $(pkglibdir) $(job_submit_cray_la_OBJECTS) $(job_submit_cray_la_LIBADD) $(LIBS)
+job_submit_cray_aries.la: $(job_submit_cray_aries_la_OBJECTS) $(job_submit_cray_aries_la_DEPENDENCIES) $(EXTRA_job_submit_cray_aries_la_DEPENDENCIES)
+ $(AM_V_CCLD)$(job_submit_cray_aries_la_LINK) -rpath $(pkglibdir) $(job_submit_cray_aries_la_OBJECTS) $(job_submit_cray_aries_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -578,7 +579,7 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/job_submit_cray.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/job_submit_cray_aries.Plo@am__quote@ # am--include-marker
$(am__depfiles_remade):
@$(MKDIR_P) $(@D)
@@ -741,7 +742,7 @@ clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
mostlyclean-am
distclean: distclean-am
- -rm -f ./$(DEPDIR)/job_submit_cray.Plo
+ -rm -f ./$(DEPDIR)/job_submit_cray_aries.Plo
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -787,7 +788,7 @@ install-ps-am:
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -f ./$(DEPDIR)/job_submit_cray.Plo
+ -rm -f ./$(DEPDIR)/job_submit_cray_aries.Plo
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
diff --git a/src/plugins/job_submit/cray/job_submit_cray.c b/src/plugins/job_submit/cray_aries/job_submit_cray_aries.c
similarity index 94%
rename from src/plugins/job_submit/cray/job_submit_cray.c
rename to src/plugins/job_submit/cray_aries/job_submit_cray_aries.c
index 95ec5679b6c..7c43ae4448f 100644
--- a/src/plugins/job_submit/cray/job_submit_cray.c
+++ b/src/plugins/job_submit/cray_aries/job_submit_cray_aries.c
@@ -1,6 +1,6 @@
/*****************************************************************************\
- * job_submit_cray.c - Infrastructure for native Slurm operation on Cray
- * computers
+ * job_submit_cray_aries.c - Infrastructure for native Slurm operation on
+ * Cray/Aries computers
*****************************************************************************
* Copyright (C) 2013 SchedMD LLC.
* Copyright (C) 2014 Cray Inc. All Rights Reserved.
@@ -73,8 +73,8 @@
* plugin_version - an unsigned 32-bit integer containing the Slurm version
* (major.minor.micro combined into a single number).
*/
-const char plugin_name[] = "Job submit Cray plugin";
-const char plugin_type[] = "job_submit/cray";
+const char plugin_name[] = "Job submit Cray/Aries plugin";
+const char plugin_type[] = "job_submit/cray_aries";
const uint32_t plugin_version = SLURM_VERSION_NUMBER;
#define CRAY_GRES "craynetwork"
diff --git a/src/plugins/power/Makefile.am b/src/plugins/power/Makefile.am
index ce2145e2a9c..ccde44c3223 100644
--- a/src/plugins/power/Makefile.am
+++ b/src/plugins/power/Makefile.am
@@ -1,3 +1,3 @@
# Makefile for power management plugins
-SUBDIRS = common cray none
+SUBDIRS = common cray_aries none
diff --git a/src/plugins/power/Makefile.in b/src/plugins/power/Makefile.in
index 3aac5130faf..94fcdaa47aa 100644
--- a/src/plugins/power/Makefile.in
+++ b/src/plugins/power/Makefile.in
@@ -470,7 +470,7 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-SUBDIRS = common cray none
+SUBDIRS = common cray_aries none
all: all-recursive
.SUFFIXES:
diff --git a/src/plugins/power/cray/Makefile.am b/src/plugins/power/cray/Makefile.am
deleted file mode 100644
index 5f7e64a2b8d..00000000000
--- a/src/plugins/power/cray/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-# Makefile for power/cray plugin
-
-AUTOMAKE_OPTIONS = foreign
-
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
-
-if WITH_JSON_PARSER
-
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(JSON_CPPFLAGS)
-
-pkglib_LTLIBRARIES = power_cray.la
-power_cray_la_SOURCES = power_cray.c
-power_cray_la_LDFLAGS = $(PLUGIN_FLAGS) $(JSON_LDFLAGS)
-power_cray_la_LIBADD = ../common/libpower_common.la
-
-force:
-$(power_cray_la_LIBADD) : force
- @cd `dirname $@` && $(MAKE) `basename $@`
-
-else
-EXTRA_power_cray_la_SOURCES = power_cray.c
-endif
diff --git a/src/plugins/power/cray_aries/Makefile.am b/src/plugins/power/cray_aries/Makefile.am
new file mode 100644
index 00000000000..e388442c323
--- /dev/null
+++ b/src/plugins/power/cray_aries/Makefile.am
@@ -0,0 +1,22 @@
+# Makefile for power/cray_aries plugin
+
+AUTOMAKE_OPTIONS = foreign
+
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+
+if WITH_JSON_PARSER
+
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(JSON_CPPFLAGS)
+
+pkglib_LTLIBRARIES = power_cray_aries.la
+power_cray_aries_la_SOURCES = power_cray_aries.c
+power_cray_aries_la_LDFLAGS = $(PLUGIN_FLAGS) $(JSON_LDFLAGS)
+power_cray_aries_la_LIBADD = ../common/libpower_common.la
+
+force:
+$(power_cray_aries_la_LIBADD) : force
+ @cd `dirname $@` && $(MAKE) `basename $@`
+
+else
+EXTRA_power_cray_aries_la_SOURCES = power_cray_aries.c
+endif
diff --git a/src/plugins/power/cray/Makefile.in b/src/plugins/power/cray_aries/Makefile.in
similarity index 92%
rename from src/plugins/power/cray/Makefile.in
rename to src/plugins/power/cray_aries/Makefile.in
index 677788b23db..0c87c286563 100644
--- a/src/plugins/power/cray/Makefile.in
+++ b/src/plugins/power/cray_aries/Makefile.in
@@ -14,7 +14,7 @@
@SET_MAKE@
-# Makefile for power/cray plugin
+# Makefile for power/cray_aries plugin
VPATH = @srcdir@
am__is_gnu_make = { \
@@ -91,7 +91,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-subdir = src/plugins/power/cray
+subdir = src/plugins/power/cray_aries
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/auxdir/ax_check_compile_flag.m4 \
$(top_srcdir)/auxdir/ax_check_zlib.m4 \
@@ -174,20 +174,23 @@ am__uninstall_files_from_dir = { \
}
am__installdirs = "$(DESTDIR)$(pkglibdir)"
LTLIBRARIES = $(pkglib_LTLIBRARIES)
-@WITH_JSON_PARSER_TRUE@power_cray_la_DEPENDENCIES = \
+@WITH_JSON_PARSER_TRUE@power_cray_aries_la_DEPENDENCIES = \
@WITH_JSON_PARSER_TRUE@ ../common/libpower_common.la
-am__power_cray_la_SOURCES_DIST = power_cray.c
-@WITH_JSON_PARSER_TRUE@am_power_cray_la_OBJECTS = power_cray.lo
-am__EXTRA_power_cray_la_SOURCES_DIST = power_cray.c
-power_cray_la_OBJECTS = $(am_power_cray_la_OBJECTS)
+am__power_cray_aries_la_SOURCES_DIST = power_cray_aries.c
+@WITH_JSON_PARSER_TRUE@am_power_cray_aries_la_OBJECTS = \
+@WITH_JSON_PARSER_TRUE@ power_cray_aries.lo
+am__EXTRA_power_cray_aries_la_SOURCES_DIST = power_cray_aries.c
+power_cray_aries_la_OBJECTS = $(am_power_cray_aries_la_OBJECTS)
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
am__v_lt_1 =
-power_cray_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(power_cray_la_LDFLAGS) $(LDFLAGS) -o $@
-@WITH_JSON_PARSER_TRUE@am_power_cray_la_rpath = -rpath $(pkglibdir)
+power_cray_aries_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+ $(AM_CFLAGS) $(CFLAGS) $(power_cray_aries_la_LDFLAGS) \
+ $(LDFLAGS) -o $@
+@WITH_JSON_PARSER_TRUE@am_power_cray_aries_la_rpath = -rpath \
+@WITH_JSON_PARSER_TRUE@ $(pkglibdir)
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
am__v_P_0 = false
@@ -203,7 +206,7 @@ am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/slurm
depcomp = $(SHELL) $(top_srcdir)/auxdir/depcomp
am__maybe_remake_depfiles = depfiles
-am__depfiles_remade = ./$(DEPDIR)/power_cray.Plo
+am__depfiles_remade = ./$(DEPDIR)/power_cray_aries.Plo
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -223,9 +226,10 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
am__v_CCLD_0 = @echo " CCLD " $@;
am__v_CCLD_1 =
-SOURCES = $(power_cray_la_SOURCES) $(EXTRA_power_cray_la_SOURCES)
-DIST_SOURCES = $(am__power_cray_la_SOURCES_DIST) \
- $(am__EXTRA_power_cray_la_SOURCES_DIST)
+SOURCES = $(power_cray_aries_la_SOURCES) \
+ $(EXTRA_power_cray_aries_la_SOURCES)
+DIST_SOURCES = $(am__power_cray_aries_la_SOURCES_DIST) \
+ $(am__EXTRA_power_cray_aries_la_SOURCES_DIST)
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
@@ -499,11 +503,11 @@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
PLUGIN_FLAGS = -module -avoid-version --export-dynamic
@WITH_JSON_PARSER_TRUE@AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(JSON_CPPFLAGS)
-@WITH_JSON_PARSER_TRUE@pkglib_LTLIBRARIES = power_cray.la
-@WITH_JSON_PARSER_TRUE@power_cray_la_SOURCES = power_cray.c
-@WITH_JSON_PARSER_TRUE@power_cray_la_LDFLAGS = $(PLUGIN_FLAGS) $(JSON_LDFLAGS)
-@WITH_JSON_PARSER_TRUE@power_cray_la_LIBADD = ../common/libpower_common.la
-@WITH_JSON_PARSER_FALSE@EXTRA_power_cray_la_SOURCES = power_cray.c
+@WITH_JSON_PARSER_TRUE@pkglib_LTLIBRARIES = power_cray_aries.la
+@WITH_JSON_PARSER_TRUE@power_cray_aries_la_SOURCES = power_cray_aries.c
+@WITH_JSON_PARSER_TRUE@power_cray_aries_la_LDFLAGS = $(PLUGIN_FLAGS) $(JSON_LDFLAGS)
+@WITH_JSON_PARSER_TRUE@power_cray_aries_la_LIBADD = ../common/libpower_common.la
+@WITH_JSON_PARSER_FALSE@EXTRA_power_cray_aries_la_SOURCES = power_cray_aries.c
all: all-am
.SUFFIXES:
@@ -517,9 +521,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/power/cray/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/power/cray_aries/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign src/plugins/power/cray/Makefile
+ $(AUTOMAKE) --foreign src/plugins/power/cray_aries/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -573,8 +577,8 @@ clean-pkglibLTLIBRARIES:
rm -f $${locs}; \
}
-power_cray.la: $(power_cray_la_OBJECTS) $(power_cray_la_DEPENDENCIES) $(EXTRA_power_cray_la_DEPENDENCIES)
- $(AM_V_CCLD)$(power_cray_la_LINK) $(am_power_cray_la_rpath) $(power_cray_la_OBJECTS) $(power_cray_la_LIBADD) $(LIBS)
+power_cray_aries.la: $(power_cray_aries_la_OBJECTS) $(power_cray_aries_la_DEPENDENCIES) $(EXTRA_power_cray_aries_la_DEPENDENCIES)
+ $(AM_V_CCLD)$(power_cray_aries_la_LINK) $(am_power_cray_aries_la_rpath) $(power_cray_aries_la_OBJECTS) $(power_cray_aries_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -582,7 +586,7 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/power_cray.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/power_cray_aries.Plo@am__quote@ # am--include-marker
$(am__depfiles_remade):
@$(MKDIR_P) $(@D)
@@ -745,7 +749,7 @@ clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
mostlyclean-am
distclean: distclean-am
- -rm -f ./$(DEPDIR)/power_cray.Plo
+ -rm -f ./$(DEPDIR)/power_cray_aries.Plo
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -791,7 +795,7 @@ install-ps-am:
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -f ./$(DEPDIR)/power_cray.Plo
+ -rm -f ./$(DEPDIR)/power_cray_aries.Plo
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -831,7 +835,7 @@ uninstall-am: uninstall-pkglibLTLIBRARIES
@WITH_JSON_PARSER_TRUE@force:
-@WITH_JSON_PARSER_TRUE@$(power_cray_la_LIBADD) : force
+@WITH_JSON_PARSER_TRUE@$(power_cray_aries_la_LIBADD) : force
@WITH_JSON_PARSER_TRUE@ @cd `dirname $@` && $(MAKE) `basename $@`
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/src/plugins/power/cray/power_cray.c b/src/plugins/power/cray_aries/power_cray_aries.c
similarity index 99%
rename from src/plugins/power/cray/power_cray.c
rename to src/plugins/power/cray_aries/power_cray_aries.c
index be60cb22e31..4c39262df1f 100644
--- a/src/plugins/power/cray/power_cray.c
+++ b/src/plugins/power/cray_aries/power_cray_aries.c
@@ -1,5 +1,5 @@
/*****************************************************************************\
- * power_cray.c - Plugin for Cray power management.
+ * power_cray_aries.c - Plugin for Cray/Aries power management.
*****************************************************************************
* Copyright (C) 2014-2015 SchedMD LLC.
* Written by Morris Jette <jette@schedmd.com>
@@ -125,8 +125,8 @@ typedef struct power_config_nodes {
* plugin_version - an unsigned 32-bit integer containing the Slurm version
* (major.minor.micro combined into a single number).
*/
-const char plugin_name[] = "power cray plugin";
-const char plugin_type[] = "power/cray";
+const char plugin_name[] = "power Cray/Aries plugin";
+const char plugin_type[] = "power/cray_aries";
const uint32_t plugin_version = SLURM_VERSION_NUMBER;
/*********************** local variables *********************/
diff --git a/src/plugins/proctrack/Makefile.am b/src/plugins/proctrack/Makefile.am
index 0b02984b63b..49c845a8459 100644
--- a/src/plugins/proctrack/Makefile.am
+++ b/src/plugins/proctrack/Makefile.am
@@ -1,7 +1,7 @@
# Makefile for proctrack plugins
if HAVE_NATIVE_CRAY
-CRAY = cray
+CRAY = cray_aries
endif
SUBDIRS = $(CRAY) linuxproc pgid
diff --git a/src/plugins/proctrack/Makefile.in b/src/plugins/proctrack/Makefile.in
index 6be1c1cc833..e9cb05c3669 100644
--- a/src/plugins/proctrack/Makefile.in
+++ b/src/plugins/proctrack/Makefile.in
@@ -199,7 +199,7 @@ am__define_uniq_tagged_files = \
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
-DIST_SUBDIRS = cray linuxproc pgid cgroup
+DIST_SUBDIRS = cray_aries linuxproc pgid cgroup
am__DIST_COMMON = $(srcdir)/Makefile.in
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
am__relativize = \
@@ -471,7 +471,7 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-@HAVE_NATIVE_CRAY_TRUE@CRAY = cray
+@HAVE_NATIVE_CRAY_TRUE@CRAY = cray_aries
SUBDIRS = $(CRAY) linuxproc pgid $(am__append_1)
all: all-recursive
diff --git a/src/plugins/proctrack/cray/Makefile.am b/src/plugins/proctrack/cray_aries/Makefile.am
similarity index 54%
rename from src/plugins/proctrack/cray/Makefile.am
rename to src/plugins/proctrack/cray_aries/Makefile.am
index d0b8c6309cd..93528124669 100644
--- a/src/plugins/proctrack/cray/Makefile.am
+++ b/src/plugins/proctrack/cray_aries/Makefile.am
@@ -6,7 +6,7 @@ PLUGIN_FLAGS = - -module -avoid-version --export-dynamic
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(CRAY_JOB_CPPFLAGS)
-pkglib_LTLIBRARIES = proctrack_cray.la
+pkglib_LTLIBRARIES = proctrack_cray_aries.la
-proctrack_cray_la_SOURCES = proctrack_cray.c
-proctrack_cray_la_LDFLAGS = $(PLUGIN_FLAGS) $(CRAY_JOB_LDFLAGS)
+proctrack_cray_aries_la_SOURCES = proctrack_cray_aries.c
+proctrack_cray_aries_la_LDFLAGS = $(PLUGIN_FLAGS) $(CRAY_JOB_LDFLAGS)
diff --git a/src/plugins/proctrack/cray/Makefile.in b/src/plugins/proctrack/cray_aries/Makefile.in
similarity index 95%
rename from src/plugins/proctrack/cray/Makefile.in
rename to src/plugins/proctrack/cray_aries/Makefile.in
index 00aad238939..cfc9938cdf1 100644
--- a/src/plugins/proctrack/cray/Makefile.in
+++ b/src/plugins/proctrack/cray_aries/Makefile.in
@@ -91,7 +91,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-subdir = src/plugins/proctrack/cray
+subdir = src/plugins/proctrack/cray_aries
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/auxdir/ax_check_compile_flag.m4 \
$(top_srcdir)/auxdir/ax_check_zlib.m4 \
@@ -174,17 +174,18 @@ am__uninstall_files_from_dir = { \
}
am__installdirs = "$(DESTDIR)$(pkglibdir)"
LTLIBRARIES = $(pkglib_LTLIBRARIES)
-proctrack_cray_la_LIBADD =
-am_proctrack_cray_la_OBJECTS = proctrack_cray.lo
-proctrack_cray_la_OBJECTS = $(am_proctrack_cray_la_OBJECTS)
+proctrack_cray_aries_la_LIBADD =
+am_proctrack_cray_aries_la_OBJECTS = proctrack_cray_aries.lo
+proctrack_cray_aries_la_OBJECTS = \
+ $(am_proctrack_cray_aries_la_OBJECTS)
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
am__v_lt_1 =
-proctrack_cray_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+proctrack_cray_aries_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
- $(AM_CFLAGS) $(CFLAGS) $(proctrack_cray_la_LDFLAGS) $(LDFLAGS) \
- -o $@
+ $(AM_CFLAGS) $(CFLAGS) $(proctrack_cray_aries_la_LDFLAGS) \
+ $(LDFLAGS) -o $@
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
am__v_P_0 = false
@@ -200,7 +201,7 @@ am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/slurm
depcomp = $(SHELL) $(top_srcdir)/auxdir/depcomp
am__maybe_remake_depfiles = depfiles
-am__depfiles_remade = ./$(DEPDIR)/proctrack_cray.Plo
+am__depfiles_remade = ./$(DEPDIR)/proctrack_cray_aries.Plo
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -220,8 +221,8 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
am__v_CCLD_0 = @echo " CCLD " $@;
am__v_CCLD_1 =
-SOURCES = $(proctrack_cray_la_SOURCES)
-DIST_SOURCES = $(proctrack_cray_la_SOURCES)
+SOURCES = $(proctrack_cray_aries_la_SOURCES)
+DIST_SOURCES = $(proctrack_cray_aries_la_SOURCES)
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
@@ -495,9 +496,9 @@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
PLUGIN_FLAGS = - -module -avoid-version --export-dynamic
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(CRAY_JOB_CPPFLAGS)
-pkglib_LTLIBRARIES = proctrack_cray.la
-proctrack_cray_la_SOURCES = proctrack_cray.c
-proctrack_cray_la_LDFLAGS = $(PLUGIN_FLAGS) $(CRAY_JOB_LDFLAGS)
+pkglib_LTLIBRARIES = proctrack_cray_aries.la
+proctrack_cray_aries_la_SOURCES = proctrack_cray_aries.c
+proctrack_cray_aries_la_LDFLAGS = $(PLUGIN_FLAGS) $(CRAY_JOB_LDFLAGS)
all: all-am
.SUFFIXES:
@@ -511,9 +512,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/proctrack/cray/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/proctrack/cray_aries/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign src/plugins/proctrack/cray/Makefile
+ $(AUTOMAKE) --foreign src/plugins/proctrack/cray_aries/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -567,8 +568,8 @@ clean-pkglibLTLIBRARIES:
rm -f $${locs}; \
}
-proctrack_cray.la: $(proctrack_cray_la_OBJECTS) $(proctrack_cray_la_DEPENDENCIES) $(EXTRA_proctrack_cray_la_DEPENDENCIES)
- $(AM_V_CCLD)$(proctrack_cray_la_LINK) -rpath $(pkglibdir) $(proctrack_cray_la_OBJECTS) $(proctrack_cray_la_LIBADD) $(LIBS)
+proctrack_cray_aries.la: $(proctrack_cray_aries_la_OBJECTS) $(proctrack_cray_aries_la_DEPENDENCIES) $(EXTRA_proctrack_cray_aries_la_DEPENDENCIES)
+ $(AM_V_CCLD)$(proctrack_cray_aries_la_LINK) -rpath $(pkglibdir) $(proctrack_cray_aries_la_OBJECTS) $(proctrack_cray_aries_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -576,7 +577,7 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proctrack_cray.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proctrack_cray_aries.Plo@am__quote@ # am--include-marker
$(am__depfiles_remade):
@$(MKDIR_P) $(@D)
@@ -739,7 +740,7 @@ clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
mostlyclean-am
distclean: distclean-am
- -rm -f ./$(DEPDIR)/proctrack_cray.Plo
+ -rm -f ./$(DEPDIR)/proctrack_cray_aries.Plo
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -785,7 +786,7 @@ install-ps-am:
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -f ./$(DEPDIR)/proctrack_cray.Plo
+ -rm -f ./$(DEPDIR)/proctrack_cray_aries.Plo
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
diff --git a/src/plugins/proctrack/cray/proctrack_cray.c b/src/plugins/proctrack/cray_aries/proctrack_cray_aries.c
similarity index 98%
rename from src/plugins/proctrack/cray/proctrack_cray.c
rename to src/plugins/proctrack/cray_aries/proctrack_cray_aries.c
index febe140f691..54a3fe1bb31 100644
--- a/src/plugins/proctrack/cray/proctrack_cray.c
+++ b/src/plugins/proctrack/cray_aries/proctrack_cray_aries.c
@@ -1,5 +1,5 @@
/*****************************************************************************\
- * proctrack_cray.c - process tracking via Cray's APIs.
+ * proctrack_cray_aries.c - process tracking via Cray's API with Aries.
*****************************************************************************
* Copyright (C) 2013 SchedMD LLC
* Written by Danny Auble <da@schedmd.com> who borrowed heavily from
@@ -60,8 +60,8 @@
#include "src/slurmd/slurmstepd/slurmstepd_job.h"
-const char plugin_name[] = "Process tracking via Cray job module";
-const char plugin_type[] = "proctrack/cray";
+const char plugin_name[] = "Process tracking via Cray/Aries job module";
+const char plugin_type[] = "proctrack/cray_aries";
const uint32_t plugin_version = SLURM_VERSION_NUMBER;
/*
diff --git a/src/plugins/select/Makefile.am b/src/plugins/select/Makefile.am
index c1e6db5bf5c..09fdfd23133 100644
--- a/src/plugins/select/Makefile.am
+++ b/src/plugins/select/Makefile.am
@@ -1,19 +1,19 @@
# Makefile for node selection plugins
-# NOTE: other must be in the list before cray lest the build break
-SUBDIRS = other cons_res cons_tres cray linear
+# NOTE: other must be in the list before cray_aries lest the build break
+SUBDIRS = other cons_res cons_tres cray_aries linear
# Each plugin here needs a plugin_id, here are the currect plug_ids
# for each plugin.
-# bluegene = 100 ==> Not currently used
-# cons_res = 101
-# linear = 102
-# bgq = 103 ==> Not currently used
-# alps + linear = 104 ==> Not currently used
-# alps + cons_res = 105 ==> Not currently used
-# serial = 106 ==> Not currently used
-# cray + linear = 107
-# cray + cons_res = 108
-# cons_tres = 109
-# cray + cons_tres = 110
+# bluegene = 100 ==> Not currently used
+# cons_res = 101
+# linear = 102
+# bgq = 103 ==> Not currently used
+# alps + linear = 104 ==> Not currently used
+# alps + cons_res = 105 ==> Not currently used
+# serial = 106 ==> Not currently used
+# cray_aries + linear = 107
+# cray_aries + cons_res = 108
+# cons_tres = 109
+# cray_aries + cons_tres = 110
diff --git a/src/plugins/select/Makefile.in b/src/plugins/select/Makefile.in
index a944534be94..e20d24010d7 100644
--- a/src/plugins/select/Makefile.in
+++ b/src/plugins/select/Makefile.in
@@ -471,8 +471,8 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-# NOTE: other must be in the list before cray lest the build break
-SUBDIRS = other cons_res cons_tres cray linear
+# NOTE: other must be in the list before cray_aries lest the build break
+SUBDIRS = other cons_res cons_tres cray_aries linear
all: all-recursive
.SUFFIXES:
@@ -791,17 +791,17 @@ uninstall-am:
# Each plugin here needs a plugin_id, here are the currect plug_ids
# for each plugin.
-# bluegene = 100 ==> Not currently used
-# cons_res = 101
-# linear = 102
-# bgq = 103 ==> Not currently used
-# alps + linear = 104 ==> Not currently used
-# alps + cons_res = 105 ==> Not currently used
-# serial = 106 ==> Not currently used
-# cray + linear = 107
-# cray + cons_res = 108
-# cons_tres = 109
-# cray + cons_tres = 110
+# bluegene = 100 ==> Not currently used
+# cons_res = 101
+# linear = 102
+# bgq = 103 ==> Not currently used
+# alps + linear = 104 ==> Not currently used
+# alps + cons_res = 105 ==> Not currently used
+# serial = 106 ==> Not currently used
+# cray_aries + linear = 107
+# cray_aries + cons_res = 108
+# cons_tres = 109
+# cray_aries + cons_tres = 110
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/src/plugins/select/cray/Makefile.am b/src/plugins/select/cray/Makefile.am
deleted file mode 100644
index d848200116a..00000000000
--- a/src/plugins/select/cray/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-# Makefile for select/cray plugin
-
-AUTOMAKE_OPTIONS = foreign
-
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
-
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common \
- -I$(top_srcdir)/src/plugins/select/other $(CRAY_SELECT_CPPFLAGS)
-
-pkglib_LTLIBRARIES = select_cray.la
-
-# Cray node selection plugin.
-select_cray_la_SOURCES = ccm.c ccm.h select_cray.c
-select_cray_la_LDFLAGS = $(PLUGIN_FLAGS) $(CRAY_SELECT_LDFLAGS)
-select_cray_la_LIBADD = ../other/libother_select.la
diff --git a/src/plugins/select/cray_aries/Makefile.am b/src/plugins/select/cray_aries/Makefile.am
new file mode 100644
index 00000000000..0df1d1b4636
--- /dev/null
+++ b/src/plugins/select/cray_aries/Makefile.am
@@ -0,0 +1,15 @@
+# Makefile for select/cray_aries plugin
+
+AUTOMAKE_OPTIONS = foreign
+
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common \
+ -I$(top_srcdir)/src/plugins/select/other $(CRAY_SELECT_CPPFLAGS)
+
+pkglib_LTLIBRARIES = select_cray_aries.la
+
+# Cray/Aries node selection plugin.
+select_cray_aries_la_SOURCES = ccm.c ccm.h select_cray_aries.c
+select_cray_aries_la_LDFLAGS = $(PLUGIN_FLAGS) $(CRAY_SELECT_LDFLAGS)
+select_cray_aries_la_LIBADD = ../other/libother_select.la
diff --git a/src/plugins/select/cray/Makefile.in b/src/plugins/select/cray_aries/Makefile.in
similarity index 94%
rename from src/plugins/select/cray/Makefile.in
rename to src/plugins/select/cray_aries/Makefile.in
index 96fbf7330dd..5e25463d74c 100644
--- a/src/plugins/select/cray/Makefile.in
+++ b/src/plugins/select/cray_aries/Makefile.in
@@ -14,7 +14,7 @@
@SET_MAKE@
-# Makefile for select/cray plugin
+# Makefile for select/cray_aries plugin
VPATH = @srcdir@
am__is_gnu_make = { \
@@ -91,7 +91,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-subdir = src/plugins/select/cray
+subdir = src/plugins/select/cray_aries
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/auxdir/ax_check_compile_flag.m4 \
$(top_srcdir)/auxdir/ax_check_zlib.m4 \
@@ -174,17 +174,17 @@ am__uninstall_files_from_dir = { \
}
am__installdirs = "$(DESTDIR)$(pkglibdir)"
LTLIBRARIES = $(pkglib_LTLIBRARIES)
-select_cray_la_DEPENDENCIES = ../other/libother_select.la
-am_select_cray_la_OBJECTS = ccm.lo select_cray.lo
-select_cray_la_OBJECTS = $(am_select_cray_la_OBJECTS)
+select_cray_aries_la_DEPENDENCIES = ../other/libother_select.la
+am_select_cray_aries_la_OBJECTS = ccm.lo select_cray_aries.lo
+select_cray_aries_la_OBJECTS = $(am_select_cray_aries_la_OBJECTS)
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
am__v_lt_1 =
-select_cray_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+select_cray_aries_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
- $(AM_CFLAGS) $(CFLAGS) $(select_cray_la_LDFLAGS) $(LDFLAGS) -o \
- $@
+ $(AM_CFLAGS) $(CFLAGS) $(select_cray_aries_la_LDFLAGS) \
+ $(LDFLAGS) -o $@
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
am__v_P_0 = false
@@ -200,7 +200,8 @@ am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/slurm
depcomp = $(SHELL) $(top_srcdir)/auxdir/depcomp
am__maybe_remake_depfiles = depfiles
-am__depfiles_remade = ./$(DEPDIR)/ccm.Plo ./$(DEPDIR)/select_cray.Plo
+am__depfiles_remade = ./$(DEPDIR)/ccm.Plo \
+ ./$(DEPDIR)/select_cray_aries.Plo
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -220,8 +221,8 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
am__v_CCLD_0 = @echo " CCLD " $@;
am__v_CCLD_1 =
-SOURCES = $(select_cray_la_SOURCES)
-DIST_SOURCES = $(select_cray_la_SOURCES)
+SOURCES = $(select_cray_aries_la_SOURCES)
+DIST_SOURCES = $(select_cray_aries_la_SOURCES)
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
@@ -497,12 +498,12 @@ PLUGIN_FLAGS = -module -avoid-version --export-dynamic
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common \
-I$(top_srcdir)/src/plugins/select/other $(CRAY_SELECT_CPPFLAGS)
-pkglib_LTLIBRARIES = select_cray.la
+pkglib_LTLIBRARIES = select_cray_aries.la
-# Cray node selection plugin.
-select_cray_la_SOURCES = ccm.c ccm.h select_cray.c
-select_cray_la_LDFLAGS = $(PLUGIN_FLAGS) $(CRAY_SELECT_LDFLAGS)
-select_cray_la_LIBADD = ../other/libother_select.la
+# Cray/Aries node selection plugin.
+select_cray_aries_la_SOURCES = ccm.c ccm.h select_cray_aries.c
+select_cray_aries_la_LDFLAGS = $(PLUGIN_FLAGS) $(CRAY_SELECT_LDFLAGS)
+select_cray_aries_la_LIBADD = ../other/libother_select.la
all: all-am
.SUFFIXES:
@@ -516,9 +517,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/select/cray/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/select/cray_aries/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign src/plugins/select/cray/Makefile
+ $(AUTOMAKE) --foreign src/plugins/select/cray_aries/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -572,8 +573,8 @@ clean-pkglibLTLIBRARIES:
rm -f $${locs}; \
}
-select_cray.la: $(select_cray_la_OBJECTS) $(select_cray_la_DEPENDENCIES) $(EXTRA_select_cray_la_DEPENDENCIES)
- $(AM_V_CCLD)$(select_cray_la_LINK) -rpath $(pkglibdir) $(select_cray_la_OBJECTS) $(select_cray_la_LIBADD) $(LIBS)
+select_cray_aries.la: $(select_cray_aries_la_OBJECTS) $(select_cray_aries_la_DEPENDENCIES) $(EXTRA_select_cray_aries_la_DEPENDENCIES)
+ $(AM_V_CCLD)$(select_cray_aries_la_LINK) -rpath $(pkglibdir) $(select_cray_aries_la_OBJECTS) $(select_cray_aries_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -582,7 +583,7 @@ distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ccm.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/select_cray.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/select_cray_aries.Plo@am__quote@ # am--include-marker
$(am__depfiles_remade):
@$(MKDIR_P) $(@D)
@@ -746,7 +747,7 @@ clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
distclean: distclean-am
-rm -f ./$(DEPDIR)/ccm.Plo
- -rm -f ./$(DEPDIR)/select_cray.Plo
+ -rm -f ./$(DEPDIR)/select_cray_aries.Plo
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -793,7 +794,7 @@ installcheck-am:
maintainer-clean: maintainer-clean-am
-rm -f ./$(DEPDIR)/ccm.Plo
- -rm -f ./$(DEPDIR)/select_cray.Plo
+ -rm -f ./$(DEPDIR)/select_cray_aries.Plo
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
diff --git a/src/plugins/select/cray/ccm.c b/src/plugins/select/cray_aries/ccm.c
similarity index 100%
rename from src/plugins/select/cray/ccm.c
rename to src/plugins/select/cray_aries/ccm.c
diff --git a/src/plugins/select/cray/ccm.h b/src/plugins/select/cray_aries/ccm.h
similarity index 100%
rename from src/plugins/select/cray/ccm.h
rename to src/plugins/select/cray_aries/ccm.h
diff --git a/src/plugins/select/cray/select_cray.c b/src/plugins/select/cray_aries/select_cray_aries.c
similarity index 99%
rename from src/plugins/select/cray/select_cray.c
rename to src/plugins/select/cray_aries/select_cray_aries.c
index 1619453b598..1c0a5320de4 100644
--- a/src/plugins/select/cray/select_cray.c
+++ b/src/plugins/select/cray_aries/select_cray_aries.c
@@ -1,5 +1,5 @@
/*****************************************************************************\
- * select_cray.c - node selection plugin for cray systems.
+ * select_cray_aries.c - node selection plugin for cray systems with Aries.
*****************************************************************************
* Copyright (C) 2013-2014 SchedMD LLC
* Copyright 2013 Cray Inc. All Rights Reserved.
@@ -223,8 +223,8 @@ static uint64_t debug_flags = 0;
* plugin_version - an unsigned 32-bit integer containing the Slurm version
* (major.minor.micro combined into a single number).
*/
-const char plugin_name[] = "Cray node selection plugin";
-const char plugin_type[] = "select/cray";
+const char plugin_name[] = "Cray/Aries node selection plugin";
+const char plugin_type[] = "select/cray_aries";
uint32_t plugin_id = SELECT_PLUGIN_CRAY_LINEAR;
const uint32_t plugin_version = SLURM_VERSION_NUMBER;
diff --git a/src/plugins/switch/Makefile.am b/src/plugins/switch/Makefile.am
index 99d4db0023b..ddfe019a65b 100644
--- a/src/plugins/switch/Makefile.am
+++ b/src/plugins/switch/Makefile.am
@@ -1,3 +1,3 @@
# Makefile for switch plugins
-SUBDIRS = cray generic none
+SUBDIRS = cray_aries generic none
diff --git a/src/plugins/switch/Makefile.in b/src/plugins/switch/Makefile.in
index 223c41e48f3..18d40200b99 100644
--- a/src/plugins/switch/Makefile.in
+++ b/src/plugins/switch/Makefile.in
@@ -470,7 +470,7 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-SUBDIRS = cray generic none
+SUBDIRS = cray_aries generic none
all: all-recursive
.SUFFIXES:
diff --git a/src/plugins/switch/cray/Makefile.am b/src/plugins/switch/cray_aries/Makefile.am
similarity index 51%
rename from src/plugins/switch/cray/Makefile.am
rename to src/plugins/switch/cray_aries/Makefile.am
index f27cfbedc0c..dd0f763a5f1 100644
--- a/src/plugins/switch/cray/Makefile.am
+++ b/src/plugins/switch/cray_aries/Makefile.am
@@ -1,26 +1,26 @@
-# Makefile for switch/cray plugin
+# Makefile for switch/cray_aries plugin
AUTOMAKE_OPTIONS = foreign
PLUGIN_FLAGS = -module -avoid-version --export-dynamic
-pkglib_LTLIBRARIES = switch_cray.la
+pkglib_LTLIBRARIES = switch_cray_aries.la
-# Cray switch plugin.
-switch_cray_la_SOURCES = \
+# Cray_Aries switch plugin.
+switch_cray_aries_la_SOURCES = \
cookies.c \
gpu.c \
iaa.c \
pe_info.c \
scaling.c \
- switch_cray.c \
- switch_cray.h \
+ switch_cray_aries.c \
+ switch_cray_aries.h \
util.c
-switch_cray_la_LDFLAGS = \
+switch_cray_aries_la_LDFLAGS = \
\
$(PLUGIN_FLAGS) \
$(CRAY_SWITCH_LDFLAGS)
-switch_cray_la_CPPFLAGS = \
+switch_cray_aries_la_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/src/common \
$(CRAY_SWITCH_CPPFLAGS)
diff --git a/src/plugins/switch/cray/Makefile.in b/src/plugins/switch/cray_aries/Makefile.in
similarity index 77%
rename from src/plugins/switch/cray/Makefile.in
rename to src/plugins/switch/cray_aries/Makefile.in
index d62ebaab2f8..9a9b0111987 100644
--- a/src/plugins/switch/cray/Makefile.in
+++ b/src/plugins/switch/cray_aries/Makefile.in
@@ -14,7 +14,7 @@
@SET_MAKE@
-# Makefile for switch/cray plugin
+# Makefile for switch/cray_aries plugin
VPATH = @srcdir@
am__is_gnu_make = { \
@@ -91,7 +91,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-subdir = src/plugins/switch/cray
+subdir = src/plugins/switch/cray_aries
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/auxdir/ax_check_compile_flag.m4 \
$(top_srcdir)/auxdir/ax_check_zlib.m4 \
@@ -174,20 +174,22 @@ am__uninstall_files_from_dir = { \
}
am__installdirs = "$(DESTDIR)$(pkglibdir)"
LTLIBRARIES = $(pkglib_LTLIBRARIES)
-switch_cray_la_LIBADD =
-am_switch_cray_la_OBJECTS = switch_cray_la-cookies.lo \
- switch_cray_la-gpu.lo switch_cray_la-iaa.lo \
- switch_cray_la-pe_info.lo switch_cray_la-scaling.lo \
- switch_cray_la-switch_cray.lo switch_cray_la-util.lo
-switch_cray_la_OBJECTS = $(am_switch_cray_la_OBJECTS)
+switch_cray_aries_la_LIBADD =
+am_switch_cray_aries_la_OBJECTS = switch_cray_aries_la-cookies.lo \
+ switch_cray_aries_la-gpu.lo switch_cray_aries_la-iaa.lo \
+ switch_cray_aries_la-pe_info.lo \
+ switch_cray_aries_la-scaling.lo \
+ switch_cray_aries_la-switch_cray_aries.lo \
+ switch_cray_aries_la-util.lo
+switch_cray_aries_la_OBJECTS = $(am_switch_cray_aries_la_OBJECTS)
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
am__v_lt_1 =
-switch_cray_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+switch_cray_aries_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
- $(AM_CFLAGS) $(CFLAGS) $(switch_cray_la_LDFLAGS) $(LDFLAGS) -o \
- $@
+ $(AM_CFLAGS) $(CFLAGS) $(switch_cray_aries_la_LDFLAGS) \
+ $(LDFLAGS) -o $@
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
am__v_P_0 = false
@@ -203,13 +205,13 @@ am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/slurm
depcomp = $(SHELL) $(top_srcdir)/auxdir/depcomp
am__maybe_remake_depfiles = depfiles
-am__depfiles_remade = ./$(DEPDIR)/switch_cray_la-cookies.Plo \
- ./$(DEPDIR)/switch_cray_la-gpu.Plo \
- ./$(DEPDIR)/switch_cray_la-iaa.Plo \
- ./$(DEPDIR)/switch_cray_la-pe_info.Plo \
- ./$(DEPDIR)/switch_cray_la-scaling.Plo \
- ./$(DEPDIR)/switch_cray_la-switch_cray.Plo \
- ./$(DEPDIR)/switch_cray_la-util.Plo
+am__depfiles_remade = ./$(DEPDIR)/switch_cray_aries_la-cookies.Plo \
+ ./$(DEPDIR)/switch_cray_aries_la-gpu.Plo \
+ ./$(DEPDIR)/switch_cray_aries_la-iaa.Plo \
+ ./$(DEPDIR)/switch_cray_aries_la-pe_info.Plo \
+ ./$(DEPDIR)/switch_cray_aries_la-scaling.Plo \
+ ./$(DEPDIR)/switch_cray_aries_la-switch_cray_aries.Plo \
+ ./$(DEPDIR)/switch_cray_aries_la-util.Plo
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -229,8 +231,8 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
am__v_CCLD_0 = @echo " CCLD " $@;
am__v_CCLD_1 =
-SOURCES = $(switch_cray_la_SOURCES)
-DIST_SOURCES = $(switch_cray_la_SOURCES)
+SOURCES = $(switch_cray_aries_la_SOURCES)
+DIST_SOURCES = $(switch_cray_aries_la_SOURCES)
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
@@ -503,25 +505,25 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
PLUGIN_FLAGS = -module -avoid-version --export-dynamic
-pkglib_LTLIBRARIES = switch_cray.la
+pkglib_LTLIBRARIES = switch_cray_aries.la
-# Cray switch plugin.
-switch_cray_la_SOURCES = \
+# Cray_Aries switch plugin.
+switch_cray_aries_la_SOURCES = \
cookies.c \
gpu.c \
iaa.c \
pe_info.c \
scaling.c \
- switch_cray.c \
- switch_cray.h \
+ switch_cray_aries.c \
+ switch_cray_aries.h \
util.c
-switch_cray_la_LDFLAGS = \
+switch_cray_aries_la_LDFLAGS = \
\
$(PLUGIN_FLAGS) \
$(CRAY_SWITCH_LDFLAGS)
-switch_cray_la_CPPFLAGS = \
+switch_cray_aries_la_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/src/common \
$(CRAY_SWITCH_CPPFLAGS)
@@ -539,9 +541,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/switch/cray/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/switch/cray_aries/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign src/plugins/switch/cray/Makefile
+ $(AUTOMAKE) --foreign src/plugins/switch/cray_aries/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -595,8 +597,8 @@ clean-pkglibLTLIBRARIES:
rm -f $${locs}; \
}
-switch_cray.la: $(switch_cray_la_OBJECTS) $(switch_cray_la_DEPENDENCIES) $(EXTRA_switch_cray_la_DEPENDENCIES)
- $(AM_V_CCLD)$(switch_cray_la_LINK) -rpath $(pkglibdir) $(switch_cray_la_OBJECTS) $(switch_cray_la_LIBADD) $(LIBS)
+switch_cray_aries.la: $(switch_cray_aries_la_OBJECTS) $(switch_cray_aries_la_DEPENDENCIES) $(EXTRA_switch_cray_aries_la_DEPENDENCIES)
+ $(AM_V_CCLD)$(switch_cray_aries_la_LINK) -rpath $(pkglibdir) $(switch_cray_aries_la_OBJECTS) $(switch_cray_aries_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -604,13 +606,13 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/switch_cray_la-cookies.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/switch_cray_la-gpu.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/switch_cray_la-iaa.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/switch_cray_la-pe_info.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/switch_cray_la-scaling.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/switch_cray_la-switch_cray.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/switch_cray_la-util.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/switch_cray_aries_la-cookies.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/switch_cray_aries_la-gpu.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/switch_cray_aries_la-iaa.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/switch_cray_aries_la-pe_info.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/switch_cray_aries_la-scaling.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/switch_cray_aries_la-switch_cray_aries.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/switch_cray_aries_la-util.Plo@am__quote@ # am--include-marker
$(am__depfiles_remade):
@$(MKDIR_P) $(@D)
@@ -639,54 +641,54 @@ am--depfiles: $(am__depfiles_remade)
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
-switch_cray_la-cookies.lo: cookies.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(switch_cray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT switch_cray_la-cookies.lo -MD -MP -MF $(DEPDIR)/switch_cray_la-cookies.Tpo -c -o switch_cray_la-cookies.lo `test -f 'cookies.c' || echo '$(srcdir)/'`cookies.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/switch_cray_la-cookies.Tpo $(DEPDIR)/switch_cray_la-cookies.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cookies.c' object='switch_cray_la-cookies.lo' libtool=yes @AMDEPBACKSLASH@
+switch_cray_aries_la-cookies.lo: cookies.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(switch_cray_aries_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT switch_cray_aries_la-cookies.lo -MD -MP -MF $(DEPDIR)/switch_cray_aries_la-cookies.Tpo -c -o switch_cray_aries_la-cookies.lo `test -f 'cookies.c' || echo '$(srcdir)/'`cookies.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/switch_cray_aries_la-cookies.Tpo $(DEPDIR)/switch_cray_aries_la-cookies.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cookies.c' object='switch_cray_aries_la-cookies.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(switch_cray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o switch_cray_la-cookies.lo `test -f 'cookies.c' || echo '$(srcdir)/'`cookies.c
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(switch_cray_aries_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o switch_cray_aries_la-cookies.lo `test -f 'cookies.c' || echo '$(srcdir)/'`cookies.c
-switch_cray_la-gpu.lo: gpu.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(switch_cray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT switch_cray_la-gpu.lo -MD -MP -MF $(DEPDIR)/switch_cray_la-gpu.Tpo -c -o switch_cray_la-gpu.lo `test -f 'gpu.c' || echo '$(srcdir)/'`gpu.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/switch_cray_la-gpu.Tpo $(DEPDIR)/switch_cray_la-gpu.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gpu.c' object='switch_cray_la-gpu.lo' libtool=yes @AMDEPBACKSLASH@
+switch_cray_aries_la-gpu.lo: gpu.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(switch_cray_aries_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT switch_cray_aries_la-gpu.lo -MD -MP -MF $(DEPDIR)/switch_cray_aries_la-gpu.Tpo -c -o switch_cray_aries_la-gpu.lo `test -f 'gpu.c' || echo '$(srcdir)/'`gpu.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/switch_cray_aries_la-gpu.Tpo $(DEPDIR)/switch_cray_aries_la-gpu.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gpu.c' object='switch_cray_aries_la-gpu.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(switch_cray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o switch_cray_la-gpu.lo `test -f 'gpu.c' || echo '$(srcdir)/'`gpu.c
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(switch_cray_aries_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o switch_cray_aries_la-gpu.lo `test -f 'gpu.c' || echo '$(srcdir)/'`gpu.c
-switch_cray_la-iaa.lo: iaa.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(switch_cray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT switch_cray_la-iaa.lo -MD -MP -MF $(DEPDIR)/switch_cray_la-iaa.Tpo -c -o switch_cray_la-iaa.lo `test -f 'iaa.c' || echo '$(srcdir)/'`iaa.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/switch_cray_la-iaa.Tpo $(DEPDIR)/switch_cray_la-iaa.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='iaa.c' object='switch_cray_la-iaa.lo' libtool=yes @AMDEPBACKSLASH@
+switch_cray_aries_la-iaa.lo: iaa.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(switch_cray_aries_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT switch_cray_aries_la-iaa.lo -MD -MP -MF $(DEPDIR)/switch_cray_aries_la-iaa.Tpo -c -o switch_cray_aries_la-iaa.lo `test -f 'iaa.c' || echo '$(srcdir)/'`iaa.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/switch_cray_aries_la-iaa.Tpo $(DEPDIR)/switch_cray_aries_la-iaa.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='iaa.c' object='switch_cray_aries_la-iaa.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(switch_cray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o switch_cray_la-iaa.lo `test -f 'iaa.c' || echo '$(srcdir)/'`iaa.c
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(switch_cray_aries_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o switch_cray_aries_la-iaa.lo `test -f 'iaa.c' || echo '$(srcdir)/'`iaa.c
-switch_cray_la-pe_info.lo: pe_info.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(switch_cray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT switch_cray_la-pe_info.lo -MD -MP -MF $(DEPDIR)/switch_cray_la-pe_info.Tpo -c -o switch_cray_la-pe_info.lo `test -f 'pe_info.c' || echo '$(srcdir)/'`pe_info.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/switch_cray_la-pe_info.Tpo $(DEPDIR)/switch_cray_la-pe_info.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pe_info.c' object='switch_cray_la-pe_info.lo' libtool=yes @AMDEPBACKSLASH@
+switch_cray_aries_la-pe_info.lo: pe_info.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(switch_cray_aries_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT switch_cray_aries_la-pe_info.lo -MD -MP -MF $(DEPDIR)/switch_cray_aries_la-pe_info.Tpo -c -o switch_cray_aries_la-pe_info.lo `test -f 'pe_info.c' || echo '$(srcdir)/'`pe_info.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/switch_cray_aries_la-pe_info.Tpo $(DEPDIR)/switch_cray_aries_la-pe_info.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pe_info.c' object='switch_cray_aries_la-pe_info.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(switch_cray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o switch_cray_la-pe_info.lo `test -f 'pe_info.c' || echo '$(srcdir)/'`pe_info.c
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(switch_cray_aries_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o switch_cray_aries_la-pe_info.lo `test -f 'pe_info.c' || echo '$(srcdir)/'`pe_info.c
-switch_cray_la-scaling.lo: scaling.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(switch_cray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT switch_cray_la-scaling.lo -MD -MP -MF $(DEPDIR)/switch_cray_la-scaling.Tpo -c -o switch_cray_la-scaling.lo `test -f 'scaling.c' || echo '$(srcdir)/'`scaling.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/switch_cray_la-scaling.Tpo $(DEPDIR)/switch_cray_la-scaling.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='scaling.c' object='switch_cray_la-scaling.lo' libtool=yes @AMDEPBACKSLASH@
+switch_cray_aries_la-scaling.lo: scaling.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(switch_cray_aries_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT switch_cray_aries_la-scaling.lo -MD -MP -MF $(DEPDIR)/switch_cray_aries_la-scaling.Tpo -c -o switch_cray_aries_la-scaling.lo `test -f 'scaling.c' || echo '$(srcdir)/'`scaling.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/switch_cray_aries_la-scaling.Tpo $(DEPDIR)/switch_cray_aries_la-scaling.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='scaling.c' object='switch_cray_aries_la-scaling.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(switch_cray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o switch_cray_la-scaling.lo `test -f 'scaling.c' || echo '$(srcdir)/'`scaling.c
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(switch_cray_aries_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o switch_cray_aries_la-scaling.lo `test -f 'scaling.c' || echo '$(srcdir)/'`scaling.c
-switch_cray_la-switch_cray.lo: switch_cray.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(switch_cray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT switch_cray_la-switch_cray.lo -MD -MP -MF $(DEPDIR)/switch_cray_la-switch_cray.Tpo -c -o switch_cray_la-switch_cray.lo `test -f 'switch_cray.c' || echo '$(srcdir)/'`switch_cray.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/switch_cray_la-switch_cray.Tpo $(DEPDIR)/switch_cray_la-switch_cray.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='switch_cray.c' object='switch_cray_la-switch_cray.lo' libtool=yes @AMDEPBACKSLASH@
+switch_cray_aries_la-switch_cray_aries.lo: switch_cray_aries.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(switch_cray_aries_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT switch_cray_aries_la-switch_cray_aries.lo -MD -MP -MF $(DEPDIR)/switch_cray_aries_la-switch_cray_aries.Tpo -c -o switch_cray_aries_la-switch_cray_aries.lo `test -f 'switch_cray_aries.c' || echo '$(srcdir)/'`switch_cray_aries.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/switch_cray_aries_la-switch_cray_aries.Tpo $(DEPDIR)/switch_cray_aries_la-switch_cray_aries.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='switch_cray_aries.c' object='switch_cray_aries_la-switch_cray_aries.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(switch_cray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o switch_cray_la-switch_cray.lo `test -f 'switch_cray.c' || echo '$(srcdir)/'`switch_cray.c
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(switch_cray_aries_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o switch_cray_aries_la-switch_cray_aries.lo `test -f 'switch_cray_aries.c' || echo '$(srcdir)/'`switch_cray_aries.c
-switch_cray_la-util.lo: util.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(switch_cray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT switch_cray_la-util.lo -MD -MP -MF $(DEPDIR)/switch_cray_la-util.Tpo -c -o switch_cray_la-util.lo `test -f 'util.c' || echo '$(srcdir)/'`util.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/switch_cray_la-util.Tpo $(DEPDIR)/switch_cray_la-util.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='util.c' object='switch_cray_la-util.lo' libtool=yes @AMDEPBACKSLASH@
+switch_cray_aries_la-util.lo: util.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(switch_cray_aries_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT switch_cray_aries_la-util.lo -MD -MP -MF $(DEPDIR)/switch_cray_aries_la-util.Tpo -c -o switch_cray_aries_la-util.lo `test -f 'util.c' || echo '$(srcdir)/'`util.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/switch_cray_aries_la-util.Tpo $(DEPDIR)/switch_cray_aries_la-util.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='util.c' object='switch_cray_aries_la-util.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(switch_cray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o switch_cray_la-util.lo `test -f 'util.c' || echo '$(srcdir)/'`util.c
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(switch_cray_aries_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o switch_cray_aries_la-util.lo `test -f 'util.c' || echo '$(srcdir)/'`util.c
mostlyclean-libtool:
-rm -f *.lo
@@ -822,13 +824,13 @@ clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
mostlyclean-am
distclean: distclean-am
- -rm -f ./$(DEPDIR)/switch_cray_la-cookies.Plo
- -rm -f ./$(DEPDIR)/switch_cray_la-gpu.Plo
- -rm -f ./$(DEPDIR)/switch_cray_la-iaa.Plo
- -rm -f ./$(DEPDIR)/switch_cray_la-pe_info.Plo
- -rm -f ./$(DEPDIR)/switch_cray_la-scaling.Plo
- -rm -f ./$(DEPDIR)/switch_cray_la-switch_cray.Plo
- -rm -f ./$(DEPDIR)/switch_cray_la-util.Plo
+ -rm -f ./$(DEPDIR)/switch_cray_aries_la-cookies.Plo
+ -rm -f ./$(DEPDIR)/switch_cray_aries_la-gpu.Plo
+ -rm -f ./$(DEPDIR)/switch_cray_aries_la-iaa.Plo
+ -rm -f ./$(DEPDIR)/switch_cray_aries_la-pe_info.Plo
+ -rm -f ./$(DEPDIR)/switch_cray_aries_la-scaling.Plo
+ -rm -f ./$(DEPDIR)/switch_cray_aries_la-switch_cray_aries.Plo
+ -rm -f ./$(DEPDIR)/switch_cray_aries_la-util.Plo
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -874,13 +876,13 @@ install-ps-am:
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -f ./$(DEPDIR)/switch_cray_la-cookies.Plo
- -rm -f ./$(DEPDIR)/switch_cray_la-gpu.Plo
- -rm -f ./$(DEPDIR)/switch_cray_la-iaa.Plo
- -rm -f ./$(DEPDIR)/switch_cray_la-pe_info.Plo
- -rm -f ./$(DEPDIR)/switch_cray_la-scaling.Plo
- -rm -f ./$(DEPDIR)/switch_cray_la-switch_cray.Plo
- -rm -f ./$(DEPDIR)/switch_cray_la-util.Plo
+ -rm -f ./$(DEPDIR)/switch_cray_aries_la-cookies.Plo
+ -rm -f ./$(DEPDIR)/switch_cray_aries_la-gpu.Plo
+ -rm -f ./$(DEPDIR)/switch_cray_aries_la-iaa.Plo
+ -rm -f ./$(DEPDIR)/switch_cray_aries_la-pe_info.Plo
+ -rm -f ./$(DEPDIR)/switch_cray_aries_la-scaling.Plo
+ -rm -f ./$(DEPDIR)/switch_cray_aries_la-switch_cray_aries.Plo
+ -rm -f ./$(DEPDIR)/switch_cray_aries_la-util.Plo
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
diff --git a/src/plugins/switch/cray/cookies.c b/src/plugins/switch/cray_aries/cookies.c
similarity index 99%
rename from src/plugins/switch/cray/cookies.c
rename to src/plugins/switch/cray_aries/cookies.c
index 2de23f392b1..deb93d8fdc1 100644
--- a/src/plugins/switch/cray/cookies.c
+++ b/src/plugins/switch/cray_aries/cookies.c
@@ -35,7 +35,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
\*****************************************************************************/
-#include "switch_cray.h"
+#include "switch_cray_aries.h"
#if defined(HAVE_NATIVE_CRAY) || defined(HAVE_CRAY_NETWORK)
diff --git a/src/plugins/switch/cray/gpu.c b/src/plugins/switch/cray_aries/gpu.c
similarity index 99%
rename from src/plugins/switch/cray/gpu.c
rename to src/plugins/switch/cray_aries/gpu.c
index e997cc18fca..056a7c34d5f 100644
--- a/src/plugins/switch/cray/gpu.c
+++ b/src/plugins/switch/cray_aries/gpu.c
@@ -35,7 +35,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
\*****************************************************************************/
-#include "switch_cray.h"
+#include "switch_cray_aries.h"
#ifdef HAVE_NATIVE_CRAY
diff --git a/src/plugins/switch/cray/iaa.c b/src/plugins/switch/cray_aries/iaa.c
similarity index 99%
rename from src/plugins/switch/cray/iaa.c
rename to src/plugins/switch/cray_aries/iaa.c
index 5bda7b43381..778776c1c13 100644
--- a/src/plugins/switch/cray/iaa.c
+++ b/src/plugins/switch/cray_aries/iaa.c
@@ -35,7 +35,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
\*****************************************************************************/
-#include "switch_cray.h"
+#include "switch_cray_aries.h"
#if defined(HAVE_NATIVE_CRAY_GA) || defined(HAVE_CRAY_NETWORK)
diff --git a/src/plugins/switch/cray/pe_info.c b/src/plugins/switch/cray_aries/pe_info.c
similarity index 99%
rename from src/plugins/switch/cray/pe_info.c
rename to src/plugins/switch/cray_aries/pe_info.c
index b2f0db536f1..196a5aa2a9c 100644
--- a/src/plugins/switch/cray/pe_info.c
+++ b/src/plugins/switch/cray_aries/pe_info.c
@@ -35,7 +35,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
\*****************************************************************************/
-#include "switch_cray.h"
+#include "switch_cray_aries.h"
#if defined (HAVE_NATIVE_CRAY) || defined(HAVE_CRAY_NETWORK)
diff --git a/src/plugins/switch/cray/scaling.c b/src/plugins/switch/cray_aries/scaling.c
similarity index 99%
rename from src/plugins/switch/cray/scaling.c
rename to src/plugins/switch/cray_aries/scaling.c
index 40f77660152..7ef5b29a364 100644
--- a/src/plugins/switch/cray/scaling.c
+++ b/src/plugins/switch/cray_aries/scaling.c
@@ -37,7 +37,7 @@
#define _GNU_SOURCE
-#include "switch_cray.h"
+#include "switch_cray_aries.h"
#if defined(HAVE_NATIVE_CRAY) || defined(HAVE_CRAY_NETWORK)
diff --git a/src/plugins/switch/cray/switch_cray.c b/src/plugins/switch/cray_aries/switch_cray_aries.c
similarity index 99%
rename from src/plugins/switch/cray/switch_cray.c
rename to src/plugins/switch/cray_aries/switch_cray_aries.c
index 2f5db821934..8ab7bfe5217 100644
--- a/src/plugins/switch/cray/switch_cray.c
+++ b/src/plugins/switch/cray_aries/switch_cray_aries.c
@@ -1,5 +1,5 @@
/*****************************************************************************\
- * switch_cray.c - Library for managing a switch on a Cray system.
+ * switch_cray_aries.c - Library for managing a switch on a Cray/Aries system.
*****************************************************************************
* Copyright (C) 2013 SchedMD LLC
* Copyright 2013 Cray Inc. All Rights Reserved.
@@ -54,7 +54,7 @@
#include <sys/stat.h>
#include <unistd.h>
-#include "switch_cray.h"
+#include "switch_cray_aries.h"
#include "slurm/slurm.h"
#include "slurm/slurm_errno.h"
#include "src/common/pack.h"
@@ -97,8 +97,8 @@ static bool lustre_no_flush = false;
* plugin_version - an unsigned 32-bit integer containing the Slurm version
* (major.minor.micro combined into a single number).
*/
-const char plugin_name[] = "switch CRAY plugin";
-const char plugin_type[] = "switch/cray";
+const char plugin_name[] = "switch Cray/Aries plugin";
+const char plugin_type[] = "switch/cray_aries";
const uint32_t plugin_version = SLURM_VERSION_NUMBER;
const uint32_t plugin_id = SWITCH_PLUGIN_CRAY;
diff --git a/src/plugins/switch/cray/switch_cray.h b/src/plugins/switch/cray_aries/switch_cray_aries.h
similarity index 97%
rename from src/plugins/switch/cray/switch_cray.h
rename to src/plugins/switch/cray_aries/switch_cray_aries.h
index bd7ae9ca510..59f30392ecc 100644
--- a/src/plugins/switch/cray/switch_cray.h
+++ b/src/plugins/switch/cray_aries/switch_cray_aries.h
@@ -1,5 +1,5 @@
/*****************************************************************************\
- * switch_cray.h - Library for managing a switch on a Cray system.
+ * switch_cray_aries.h - Library for managing a switch on a Cray/Aries system.
*****************************************************************************
* Copyright (C) 2013 SchedMD LLC
* Copyright 2013 Cray Inc. All Rights Reserved.
@@ -35,8 +35,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
\*****************************************************************************/
-#ifndef SWITCH_CRAY_H
-#define SWITCH_CRAY_H
+#ifndef SWITCH_CRAY_ARIES_H
+#define SWITCH_CRAY_ARIES_H
#include "config.h"
@@ -185,4 +185,4 @@ extern int release_cookies(slurm_cray_jobinfo_t *job);
#define CRAY_INFO(fmt, ...) info("(%s: %d: %s) "fmt, THIS_FILE, __LINE__, \
__func__, ##__VA_ARGS__);
-#endif /* SWITCH_CRAY_H */
+#endif /* SWITCH_CRAY_ARIES_H */
diff --git a/src/plugins/switch/cray/util.c b/src/plugins/switch/cray_aries/util.c
similarity index 99%
rename from src/plugins/switch/cray/util.c
rename to src/plugins/switch/cray_aries/util.c
index b4fa4dfe695..5170d0ef31d 100644
--- a/src/plugins/switch/cray/util.c
+++ b/src/plugins/switch/cray_aries/util.c
@@ -42,7 +42,7 @@
#include <sys/types.h>
#include <sys/stat.h>
-#include "switch_cray.h"
+#include "switch_cray_aries.h"
#include "slurm/slurm.h"
#include "src/common/slurm_protocol_api.h"
#include "src/common/slurm_step_layout.h"
diff --git a/src/plugins/task/Makefile.am b/src/plugins/task/Makefile.am
index 6c5c49ab1e3..8d2a36eb684 100644
--- a/src/plugins/task/Makefile.am
+++ b/src/plugins/task/Makefile.am
@@ -1,6 +1,6 @@
# Makefile for task plugins
-SUBDIRS = cray none
+SUBDIRS = cray_aries none
if HAVE_SCHED_SETAFFINITY
SUBDIRS += affinity
diff --git a/src/plugins/task/Makefile.in b/src/plugins/task/Makefile.in
index eb0cbed4e88..cd777907fc8 100644
--- a/src/plugins/task/Makefile.in
+++ b/src/plugins/task/Makefile.in
@@ -200,7 +200,7 @@ am__define_uniq_tagged_files = \
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
-DIST_SUBDIRS = cray none affinity cgroup
+DIST_SUBDIRS = cray_aries none affinity cgroup
am__DIST_COMMON = $(srcdir)/Makefile.in
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
am__relativize = \
@@ -472,7 +472,7 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-SUBDIRS = cray none $(am__append_1) $(am__append_2)
+SUBDIRS = cray_aries none $(am__append_1) $(am__append_2)
all: all-recursive
.SUFFIXES:
diff --git a/src/plugins/task/cray/Makefile.am b/src/plugins/task/cray_aries/Makefile.am
similarity index 50%
rename from src/plugins/task/cray/Makefile.am
rename to src/plugins/task/cray_aries/Makefile.am
index c79fb6977d3..0ddb84dc372 100644
--- a/src/plugins/task/cray/Makefile.am
+++ b/src/plugins/task/cray_aries/Makefile.am
@@ -1,4 +1,4 @@
-# Makefile for task/cray plugin
+# Makefile for task/cray_aries plugin
AUTOMAKE_OPTIONS = foreign
@@ -6,9 +6,9 @@ PLUGIN_FLAGS = -module -avoid-version --export-dynamic
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(CRAY_TASK_CPPFLAGS)
-pkglib_LTLIBRARIES = task_cray.la
+pkglib_LTLIBRARIES = task_cray_aries.la
# Null task plugin.
-task_cray_la_SOURCES = task_cray.c
-task_cray_la_LDFLAGS = $(PLUGIN_FLAGS) $(CRAY_TASK_LDFLAGS) \
+task_cray_aries_la_SOURCES = task_cray_aries.c
+task_cray_aries_la_LDFLAGS = $(PLUGIN_FLAGS) $(CRAY_TASK_LDFLAGS) \
$(NUMA_LIBS)
diff --git a/src/plugins/task/cray/Makefile.in b/src/plugins/task/cray_aries/Makefile.in
similarity index 95%
rename from src/plugins/task/cray/Makefile.in
rename to src/plugins/task/cray_aries/Makefile.in
index d648885e50f..46d6701b639 100644
--- a/src/plugins/task/cray/Makefile.in
+++ b/src/plugins/task/cray_aries/Makefile.in
@@ -14,7 +14,7 @@
@SET_MAKE@
-# Makefile for task/cray plugin
+# Makefile for task/cray_aries plugin
VPATH = @srcdir@
am__is_gnu_make = { \
@@ -91,7 +91,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-subdir = src/plugins/task/cray
+subdir = src/plugins/task/cray_aries
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/auxdir/ax_check_compile_flag.m4 \
$(top_srcdir)/auxdir/ax_check_zlib.m4 \
@@ -174,16 +174,17 @@ am__uninstall_files_from_dir = { \
}
am__installdirs = "$(DESTDIR)$(pkglibdir)"
LTLIBRARIES = $(pkglib_LTLIBRARIES)
-task_cray_la_LIBADD =
-am_task_cray_la_OBJECTS = task_cray.lo
-task_cray_la_OBJECTS = $(am_task_cray_la_OBJECTS)
+task_cray_aries_la_LIBADD =
+am_task_cray_aries_la_OBJECTS = task_cray_aries.lo
+task_cray_aries_la_OBJECTS = $(am_task_cray_aries_la_OBJECTS)
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
am__v_lt_1 =
-task_cray_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(task_cray_la_LDFLAGS) $(LDFLAGS) -o $@
+task_cray_aries_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+ $(AM_CFLAGS) $(CFLAGS) $(task_cray_aries_la_LDFLAGS) \
+ $(LDFLAGS) -o $@
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
am__v_P_0 = false
@@ -199,7 +200,7 @@ am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/slurm
depcomp = $(SHELL) $(top_srcdir)/auxdir/depcomp
am__maybe_remake_depfiles = depfiles
-am__depfiles_remade = ./$(DEPDIR)/task_cray.Plo
+am__depfiles_remade = ./$(DEPDIR)/task_cray_aries.Plo
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -219,8 +220,8 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
am__v_CCLD_0 = @echo " CCLD " $@;
am__v_CCLD_1 =
-SOURCES = $(task_cray_la_SOURCES)
-DIST_SOURCES = $(task_cray_la_SOURCES)
+SOURCES = $(task_cray_aries_la_SOURCES)
+DIST_SOURCES = $(task_cray_aries_la_SOURCES)
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
@@ -494,11 +495,11 @@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
PLUGIN_FLAGS = -module -avoid-version --export-dynamic
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(CRAY_TASK_CPPFLAGS)
-pkglib_LTLIBRARIES = task_cray.la
+pkglib_LTLIBRARIES = task_cray_aries.la
# Null task plugin.
-task_cray_la_SOURCES = task_cray.c
-task_cray_la_LDFLAGS = $(PLUGIN_FLAGS) $(CRAY_TASK_LDFLAGS) \
+task_cray_aries_la_SOURCES = task_cray_aries.c
+task_cray_aries_la_LDFLAGS = $(PLUGIN_FLAGS) $(CRAY_TASK_LDFLAGS) \
$(NUMA_LIBS)
all: all-am
@@ -514,9 +515,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/task/cray/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/task/cray_aries/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign src/plugins/task/cray/Makefile
+ $(AUTOMAKE) --foreign src/plugins/task/cray_aries/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -570,8 +571,8 @@ clean-pkglibLTLIBRARIES:
rm -f $${locs}; \
}
-task_cray.la: $(task_cray_la_OBJECTS) $(task_cray_la_DEPENDENCIES) $(EXTRA_task_cray_la_DEPENDENCIES)
- $(AM_V_CCLD)$(task_cray_la_LINK) -rpath $(pkglibdir) $(task_cray_la_OBJECTS) $(task_cray_la_LIBADD) $(LIBS)
+task_cray_aries.la: $(task_cray_aries_la_OBJECTS) $(task_cray_aries_la_DEPENDENCIES) $(EXTRA_task_cray_aries_la_DEPENDENCIES)
+ $(AM_V_CCLD)$(task_cray_aries_la_LINK) -rpath $(pkglibdir) $(task_cray_aries_la_OBJECTS) $(task_cray_aries_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -579,7 +580,7 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/task_cray.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/task_cray_aries.Plo@am__quote@ # am--include-marker
$(am__depfiles_remade):
@$(MKDIR_P) $(@D)
@@ -742,7 +743,7 @@ clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
mostlyclean-am
distclean: distclean-am
- -rm -f ./$(DEPDIR)/task_cray.Plo
+ -rm -f ./$(DEPDIR)/task_cray_aries.Plo
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -788,7 +789,7 @@ install-ps-am:
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -f ./$(DEPDIR)/task_cray.Plo
+ -rm -f ./$(DEPDIR)/task_cray_aries.Plo
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
diff --git a/src/plugins/task/cray/task_cray.c b/src/plugins/task/cray_aries/task_cray_aries.c
similarity index 99%
rename from src/plugins/task/cray/task_cray.c
rename to src/plugins/task/cray_aries/task_cray_aries.c
index 141fd3d7b3e..581aea14c6b 100644
--- a/src/plugins/task/cray/task_cray.c
+++ b/src/plugins/task/cray_aries/task_cray_aries.c
@@ -1,6 +1,6 @@
/*****************************************************************************\
- * task_cray.c - Library for task pre-launch and post_termination functions
- * on a cray system
+ * task_cray_aries.c - Library for task pre-launch and post_termination
+ * functions on a Cray/Aries system
*****************************************************************************
* Copyright (C) 2013 SchedMD LLC
* Copyright 2013 Cray Inc. All Rights Reserved.
@@ -89,8 +89,8 @@ static uint64_t debug_flags = 0;
* plugin_version - an unsigned 32-bit integer containing the Slurm version
* (major.minor.micro combined into a single number).
*/
-const char plugin_name[] = "task CRAY plugin";
-const char plugin_type[] = "task/cray";
+const char plugin_name[] = "task Cray/Aries plugin";
+const char plugin_type[] = "task/cray_aries";
const uint32_t plugin_version = SLURM_VERSION_NUMBER;
#ifdef HAVE_NATIVE_CRAY
diff --git a/src/slurmctld/job_scheduler.c b/src/slurmctld/job_scheduler.c
index b916b1056a9..7b267d96ac1 100644
--- a/src/slurmctld/job_scheduler.c
+++ b/src/slurmctld/job_scheduler.c
@@ -3016,7 +3016,7 @@ extern int update_job_dependency(struct job_record *job_ptr, char *new_depend)
char *select_type = slurm_get_select_type();
if (select_type &&
(strstr(select_type, "cons_tres") ||
- (strstr(select_type, "cray") &&
+ (strstr(select_type, "cray_aries") &&
(slurm_get_select_type_param() & CR_OTHER_CONS_TRES)))) {
select_hetero = 1;
} else
diff --git a/src/slurmctld/step_mgr.c b/src/slurmctld/step_mgr.c
index 432ff2c637d..3560a3dbfcc 100644
--- a/src/slurmctld/step_mgr.c
+++ b/src/slurmctld/step_mgr.c
@@ -252,7 +252,7 @@ static void _build_pending_step(struct job_record *job_ptr,
}
/*
- * Invoke post_job_step except if select/cray is used. In that plugin
+ * Invoke post_job_step except if select/cray_aries is used. In that plugin
* post_job_step() is invoked after Node Health Check completes
*/
static void _post_job_step(struct step_record *step_ptr)
@@ -261,7 +261,7 @@ static void _post_job_step(struct step_record *step_ptr)
static int select_cray_plugin = -1;
if (select_cray_plugin == -1) {
- if (!xstrcmp(slurmctld_conf.select_type, "select/cray"))
+ if (!xstrcmp(slurmctld_conf.select_type, "select/cray_aries"))
select_cray_plugin = 1;
else
select_cray_plugin = 0;
diff --git a/src/slurmd/slurmd/slurmd.c b/src/slurmd/slurmd/slurmd.c
index 25fa89ffd9a..6fc3dd19e34 100644
--- a/src/slurmd/slurmd/slurmd.c
+++ b/src/slurmd/slurmd/slurmd.c
@@ -888,7 +888,7 @@ _read_config(void)
#ifndef HAVE_FRONT_END
if (!xstrcmp(cf->select_type, "select/cons_res"))
cr_flag = true;
- if (!xstrcmp(cf->select_type, "select/cray") &&
+ if (!xstrcmp(cf->select_type, "select/cray_aries") &&
(cf->select_type_param & CR_OTHER_CONS_RES))
cr_flag = true;
diff --git a/src/slurmd/slurmstepd/slurmstepd_job.c b/src/slurmd/slurmstepd/slurmstepd_job.c
index 847a4cceefb..fcae559b87c 100644
--- a/src/slurmd/slurmstepd/slurmstepd_job.c
+++ b/src/slurmd/slurmstepd/slurmstepd_job.c
@@ -179,7 +179,7 @@ _job_init_task_info(stepd_step_rec_t *job, uint32_t **gtid,
if (job->flags & LAUNCH_MULTI_PROG) {
char *switch_type = slurm_get_switch_type();
- if (!xstrcmp(switch_type, "switch/cray"))
+ if (!xstrcmp(switch_type, "switch/cray_aries"))
multi_prog_parse(job, gtid);
xfree(switch_type);
for (i = 0; i < job->node_tasks; i++){
diff --git a/src/srun/srun.c b/src/srun/srun.c
index 9e3c5088e9c..3751dabbb82 100644
--- a/src/srun/srun.c
+++ b/src/srun/srun.c
@@ -165,7 +165,7 @@ static bool _enable_pack_steps(void)
enabled = true;
else {
char *select_type = slurm_get_select_type();
- if (select_type && strstr(select_type, "cray"))
+ if (select_type && strstr(select_type, "cray_aries"))
enabled = false;
xfree(select_type);
}
--
GitLab