To receive notifications about scheduled maintenance, please subscribe to the mailing-list gitlab-operations@sympa.ethz.ch. You can subscribe to the mailing-list at https://sympa.ethz.ch

Commit 799e093f authored by Xuqian Yan's avatar Xuqian Yan
Browse files

Minor changes in git operation and user_conf.m edition

parent e49d66a0
......@@ -100,14 +100,16 @@ In this section, we assume that you already have Nexus-e codes on Euler, so you
E.g., in the screenshot below, it is at the "xuqian" branch (seen from the "\*" sign) and there is **no "postprocess" branch yet**.
(Note: This is the most complicated case. For example, if you already have the "postprocess" branch and you are already at the "postprocess" branch, you could skip the following steps and only run `git pull`. See more information on switching branch with [git checkout](https://git-scm.com/docs/git-checkout) and updating the current branch with [git pull](https://git-scm.com/docs/git-pull).)
![](images/euler-git-branch.png)
(3) Pull changes in the "postprocess" remote branch with
(3) Fetch the origin
```git fetch origin```
(4) Pull changes in the "postprocess" remote branch with
```git pull origin postprocess```
You will the following message asking for your credentials for the "Shared" repo.
You will see the following message asking for your credentials for the "Shared" repo.
![](images/euler-git-pull-origin.png)
(4) Create and check out local branch "postprocess" with
(5) Create and check out local branch "postprocess" with
```git checkout -b postprocess origin/postprocess```
![](images/euler-git-checkout.png)
(5) Check your branch again with `git branch` to make sure that you are at the "postprocess" branch.
(6) Check your branch again with `git branch` to make sure that you are at the "postprocess" branch.
![](images/euler-git-branch-new.png)
- Sometimes you need to do the branch switching (as instructed in the step above) for other submodules as well. From [here](#i-want-to-make-changes-in-my-own-module-what-should-i-do-first), you should already know which branch you are at in each submodule.
......
......@@ -305,8 +305,15 @@ But still, we need to explicitely load all the dependencies, including modules (
```
You might encounter software compatibility problems when running Nexus-e on Euler, follow the link for possible solutions:
[Matlab & Python compatibility error: "ImportError: ...pyexpat...: undefined symbol: XML_SetHashSalt"](faq.html#matlab-python)
##### 5. Edit user_conf.m
- Make a copy of `user_example_conf.m` in the folder `Run_Nexuse`. Name the copy as `user_conf.m`. (Note: You should only work with the copy, because the original file `xxx_example_conf.m` is synchronized with git and it shouldn't be changed.)
```
cp user_example_conf.m user_conf.m
```
- Edit the variable `DB_SUFFIX` in to be your name initials.
##### 5. Run Nexus-e
##### 6. Run Nexus-e
- cd to the `Run_Nexuse` folder
- Before running `run_Nexuse.m` for the first time, you need to run `bench_Nexuse.m`.
It is recommended to repeat this step after major changes to the modules eMark and CentIv.
......@@ -314,7 +321,7 @@ But still, we need to explicitely load all the dependencies, including modules (
```
bsub -n 36 -R "model==XeonGold_6150" -R "rusage[mem=5180]" -W "10:00" matlab -r run_Nexuse
```
The parameters in this command can be costomized. Details can be found [here](https://scicomp.ethz.ch/wiki/Getting_started_with_clusters).
The parameters in this command can be costomized. Details can be found [here](euler_instruction.html#batch-system-how-to-run-nexus-e) and [here](https://scicomp.ethz.ch/wiki/Getting_started_with_clusters).
Here we give a short explanation to the example command above:
![](images/euler-job-submission.png)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment