Skip to content

Commit 192816c

Browse files
committed
Merge branch 'JOSS_pythonSubmit' of github.com:avigna/COMPAS-1 into JOSS_pythonSubmit
2 parents a910f63 + 25cfd42 commit 192816c

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

docs/compasHPC.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ to your `~/.bash_profile` or equivalent.
7979
Make a copy of the `stroopwafelInterface.py` file in the `defaults/` folder into your current directory, and set the `run_on_helios` parameter to `True`.
8080
Set any other stroopwafel parameters as you see fit.
8181

82-
If you have many non-default COMPAS arguments, you are encouraged to set them in a `pythonSubmit.py` file in the same directory,
82+
If you have many non-default COMPAS arguments, you are encouraged to set them in a `runSubmit.py` file in the same directory,
8383
and set the `usePythonSubmit` parameter to `True`.
8484

8585
See sampling.md for details.

docs/docker.md

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -41,22 +41,22 @@ To see all available versions, go to the TeamCOMPAS docker hub page [here](https
4141

4242
### Running
4343

44-
COMPAS can still be configured via command line arguments passed to the COMPAS executable or via a `pythonSubmit.py` file.
44+
COMPAS can still be configured via command line arguments passed to the COMPAS executable or via a `runSubmit.py` file.
4545

46-
#### Run pythonSubmit.py
46+
#### Execute runSubmit.py
4747

48-
To run COMPAS via a `pythonSubmit.py` file, the command is a little more complex.
48+
To run COMPAS via a `runSubmit.py` file, the command is a little more complex.
4949

5050
```
5151
docker run \
5252
--rm \
5353
-it \
5454
-v $(pwd)/compas-logs:/app/COMPAS/logs \
55-
-v $(pwd)/pythonSubmit.py:/app/starts/pythonSubmit.py \
55+
-v $(pwd)/runSubmit.py:/app/starts/runSubmit.py \
5656
-e COMPAS_EXECUTABLE_PATH=/app/COMPAS/bin/COMPAS \
5757
-e COMPAS_LOGS_OUTPUT_DIR_PATH=/app/COMPAS/logs \
5858
teamcompas/compas \
59-
python3 /app/starts/pythonSubmit.py
59+
python3 /app/starts/runSubmit.py
6060
```
6161

6262
Breaking down this command:
@@ -74,7 +74,7 @@ short for [-i and -t](https://docs.docker.com/engine/reference/run/#foreground)
7474
`-v <path-on-host>:<path-in-container>`
7575
[Bind mounts](https://docs.docker.com/storage/bind-mounts/)
7676
mount `<path-on-host>` to `<path-in-container`>
77-
This time we not only want to get the output from COMPAS on the host machine, we also want to supply a `pythonSubmit.py` to the container from the host machine.
77+
This time we not only want to get the output from COMPAS on the host machine, we also want to supply a `runSubmit.py` to the container from the host machine.
7878

7979
`-e VAR_NAME=value`
8080
[Environment variables](https://docs.docker.com/engine/reference/run/#env-environment-variables)
@@ -83,13 +83,13 @@ set the environment variable `VAR_VAME` to `value`
8383
`teamcompas/compas`
8484
the image to run
8585

86-
`python3 /app/starts/pythonSubmit.py`
86+
`python3 /app/starts/runSubmit.py`
8787
the command to run when the container starts
8888

8989

9090
#### Run the COMPAS executable
9191

92-
To run the COMPAS executable directly (i.e. without `pythonSubmit.py`)
92+
To run the COMPAS executable directly (i.e. without `runSubmit.py`)
9393
```
9494
docker run \
9595
--rm \
@@ -136,12 +136,12 @@ More info on `docker run` [here](https://docs.docker.com/engine/reference/run/)
136136

137137
NOTE 1:
138138

139-
Two new environment variables have been added, both of these apply to `pythonSubmit.py` only and are non-breaking changes.
139+
Two new environment variables have been added, both of these apply to `runSubmit.py` only and are non-breaking changes.
140140

141-
`COMPAS_EXECUTABLE_PATH` is an addition to the default `pythonSubmit.py` that overrides where `pythonSubmit.py` looks for the compiled COMPAS.
141+
`COMPAS_EXECUTABLE_PATH` is an addition to the default `runSubmit.py` that overrides where `runSubmit.py` looks for the compiled COMPAS.
142142
This override exists purely for ease-of-use from the command line.
143143

144-
`COMPAS_LOGS_OUTPUT_DIR_PATH` is also an addition to the default `pythonSubmit.py` that overrides where logs are placed.
144+
`COMPAS_LOGS_OUTPUT_DIR_PATH` is also an addition to the default `runSubmit.py` that overrides where logs are placed.
145145
The override exists because the mounted directory (option `-v`) is created before COMPAS runs. COMPAS sees that the directory where it's supposed to put logs already exists, so it created a different (i.e. non-mapped) directory to deposit logs in.
146146

147147

@@ -154,16 +154,16 @@ All container output will be hidden.
154154
An example where this would be useful is if you were running 4 instances of COMPAS at once.
155155
You could copy/paste the following into the terminal...
156156
```
157-
docker run --rm -d -v $(pwd)/compas-logs/run_0:/app/COMPAS/logs -v $(pwd)/pythonSubmitMMsolar_01.py:/app/starts/pythonSubmit.py teamcompas/compas python3 /app/starts/pythonSubmit.py &
157+
docker run --rm -d -v $(pwd)/compas-logs/run_0:/app/COMPAS/logs -v $(pwd)/runSubmitMMsolar_01.py:/app/starts/runSubmit.py teamcompas/compas python3 /app/starts/runSubmit.py &
158158
159-
docker run --rm -d -v $(pwd)/compas-logs/run_1:/app/COMPAS/logs -v $(pwd)/pythonSubmitMMsolar_02.py:/app/starts/pythonSubmit.py teamcompas/compas python3 /app/starts/pythonSubmit.py &
159+
docker run --rm -d -v $(pwd)/compas-logs/run_1:/app/COMPAS/logs -v $(pwd)/runSubmitMMsolar_02.py:/app/starts/runSubmit.py teamcompas/compas python3 /app/starts/runSubmit.py &
160160
161-
docker run --rm -d -v $(pwd)/compas-logs/run_2:/app/COMPAS/logs -v $(pwd)/pythonSubmitMMsolar_03.py:/app/starts/pythonSubmit.py teamcompas/compas python3 /app/starts/pythonSubmit.py &
161+
docker run --rm -d -v $(pwd)/compas-logs/run_2:/app/COMPAS/logs -v $(pwd)/runSubmitMMsolar_03.py:/app/starts/runSubmit.py teamcompas/compas python3 /app/starts/runSubmit.py &
162162
163-
docker run --rm -d -v $(pwd)/compas-logs/run_3:/app/COMPAS/logs -v $(pwd)/pythonSubmitMMsolar_04.py:/app/starts/pythonSubmit.py teamcompas/compas python3 /app/starts/pythonSubmit.py
163+
docker run --rm -d -v $(pwd)/compas-logs/run_3:/app/COMPAS/logs -v $(pwd)/runSubmitMMsolar_04.py:/app/starts/runSubmit.py teamcompas/compas python3 /app/starts/runSubmit.py
164164
```
165165

166-
...which would run 4 separate instances of COMPAS, each with its own `pythonSubmit.py` file and logging directory, and all console output supressed.
166+
...which would run 4 separate instances of COMPAS, each with its own `runSubmit.py` file and logging directory, and all console output supressed.
167167

168168
You may want to check the console output to see how far into the run COMPAS is.
169169
The command for this is `docker logs <container_id>`.
@@ -235,7 +235,7 @@ Make COMPAS using a specific makefile (more below) and as many cores as possible
235235
[RUN](https://docs.docker.com/engine/reference/builder/#run) docs
236236

237237
Dockerfiles will usually end with a `CMD` directive that specifies what command should run when the container is started.
238-
COMPAS doesn't have a `CMD` directive because some users will want to run the executable directly and some will want to use `pythonSubmit.`.
238+
COMPAS doesn't have a `CMD` directive because some users will want to run the executable directly and some will want to use `runSubmit.`.
239239
[CMD](https://docs.docker.com/engine/reference/builder/#cmd) docs
240240

241241

0 commit comments

Comments
 (0)