Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update documentation for change of 'chama' to 'tlcc2' (ATDV-173) #5731

Merged
merged 1 commit into from
Aug 17, 2019
Merged

Update documentation for change of 'chama' to 'tlcc2' (ATDV-173) #5731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions cmake/ctest/drivers/atdm/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,8 +411,6 @@ The following `<system_name>` sub-directories exist (in alphabetical order):
* `cee-rhel6/`: Contains files to drive builds on CEE LAnL RHEL6 machines with
a SEMS environment.

* `tlcc2/`: Contains files to drive builds on the SRN HPC tlcc2 machines.

* `mutrino/`: Contains files to drive builds on SNL machine mutrino.

* `ride/`: Contains the files to drive builds on the SRN test bed machine
Expand All @@ -432,6 +430,9 @@ The following `<system_name>` sub-directories exist (in alphabetical order):
* `shiller/`: Contains the files to drive builds on the SRN test bed machine
`shiller` which also can be run on the SON machine `hansen`.

* `tlcc2/`: Contains files to drive builds on the SRN HPC TLCC-2 machines
(e.g. 'chama', 'skybridge', etc.).

* `waterman/`: Contains files to drive builds on the SRN Test Bed machine
`waterman`.

Expand Down
27 changes: 14 additions & 13 deletions cmake/std/atdm/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,7 +565,7 @@ example, skip configure, skip the build, skip running tests, etc.

* <a href="#ridewhite">ride/white</a>
* <a href="#shillerhansen">shiller/hansen</a>
* <a href="#chamaserrano">chama/serrano/eclipse/ghost</a>
* <a href="#tlcc-2-and-cts-1">TLCC-2 and CTS-1</a>
* <a href="#mutrino">mutrino</a>
* <a href="#sems-rhel6-environment">SEMS RHEL6 Environment</a>
* <a href="#sems-rhel7-environment">SEMS RHEL7 Environment</a>
Expand Down Expand Up @@ -665,15 +665,15 @@ $ srun ./checkin-test-atdm.sh intel-opt-openmp \
```


### chama/serrano
### TLCC-2 and CTS-1

Once logged on to the TLCC-2 machine 'chama' or the CTS-1 'serrano', 'eclipse'
or 'ghost' machines, one can directly configure and build on the login node
(being careful not to overload the node) using the `chama` and `serrano` envs,
respectively. But to run the tests, one must run on the compute nodes using
the `srun` command. For example, to configure, build and run the tests for
say `MueLu` on 'serrano', (after cloning Trilinos on the `develop` branch) one
would do:
Once logged on to any TLCC2 machine (e.g. 'chama', 'skybridge') or the CTS-1
machine 'serrano', 'eclipse' or 'ghost' machines, one can directly configure
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

First "machine" is redundant.

and build on the login node (being careful not to overload the node) using the
`chama` and `serrano` envs, respectively. But to run the tests, one must run
on the compute nodes using the `srun` command. For example, to configure,
build and run the tests for say `MueLu` on 'serrano', (after cloning Trilinos
on the `develop` branch) one would do:


```
Expand All @@ -697,8 +697,9 @@ computing.sandia.gov

**NOTE:** Unlike some of the other machines, one must load the environment,
configure and build on the login node and then run the test suite on a compute
node on this system. This is what the CTest -S driver on 'chama' and
'serrano' does in order to drive jobs and submit to CDash.
node on this system. This is what the CTest -S driver does on TLCC-2 and
CTS-1 systems like 'chama' and 'serrano' in order to drive jobs and submit to
CDash.

To use the checkin-test-atdm.sh script, you must split running the tests from
the configure and build as with:
Expand Down Expand Up @@ -1322,8 +1323,6 @@ they support are:

* `cee-rhel6/`: CEE LANL RHEL6 systems with a CEE environment

* `chama/`: Supports SNL HPC TLCC-2 machine 'chama'.

* `mutrino/`: Supports SNL HPC machine 'mutrino'.

* `ride/`: Supports GNU and CUDA builds on both the SRN machine 'ride' and the
Expand All @@ -1341,6 +1340,8 @@ they support are:
* `shiller/`: Supports GNU, Intel, and CUDA builds on both the SRN machine
'shiller' and the mirror SON machine 'hansen'.

* `tlcc2/`: Supports SNL HPC TLCC-2 machines 'chama', 'skybridge', etc..

* `waterman/`: Supports GNU and CUDA builds on the SRN machine 'waterman'.


Expand Down