| ... | @@ -10,79 +10,9 @@ Diagrams with arrows here and there to pretend we do design. |
... | @@ -10,79 +10,9 @@ Diagrams with arrows here and there to pretend we do design. |
|
|
## Days to day coding
|
|
## Days to day coding
|
|
|
### [Development Cycle](Developer's-corner/Development-Cycle)
|
|
### [Development Cycle](Developer's-corner/Development-Cycle)
|
|
|
Useful tips to know when working on the code.
|
|
Useful tips to know when working on the code.
|
|
|
### [Using git](Developer's-corner/Using git)
|
|
### [Using git](Developer's-corner/Using-git)
|
|
|
Useful git tips.
|
|
Useful git tips.
|
|
|
Example of merging:
|
|
|
|
|
```
|
|
|
|
|
cd $WORKDIR
|
|
|
|
|
git clone git@gitlab.oca.euISC/fargOCA.git mergetest
|
|
|
|
|
...
|
|
|
|
|
cd mergetest
|
|
|
|
|
```
|
|
|
|
|
Load environnement, each cluster has it own set of configuration.
|
|
|
|
|
We usually in CPU mode (less rounding issues)
|
|
|
|
|
```
|
|
|
|
|
source ./contrib/build/AdAstra/cpu-cray.sh
|
|
|
|
|
```
|
|
|
|
|
make the build dir. I use (cpu|gpu)/(par/seq)/(<compiler>)/(rel/dbg)
|
|
|
|
|
encoding, but that personnal convenience.
|
|
|
|
|
|
|
|
|
|
```
|
|
|
|
|
mkdir -p cpu/par/cray/rel
|
|
|
|
|
cd cpu/par/cray/rel
|
|
|
|
|
Configure
|
|
|
|
|
cmake -G Ninja -C ../../../../contrib/build/AdAstra/CRAY-CPU-cache.txt -DCMAKE_BUILD_TYPE=Release -DENABLE_PARALLEL=ON -DGENERATE_DOC=Off ../../../../
|
|
|
|
|
|
|
|
|
|
```
|
|
|
|
|
to avoid conflicting with running test, BUT DO NOT USE IF YOU HAVE PRODUCTION JOBS RUNNING and remove specifically the test runs.
|
|
|
|
|
|
|
|
|
|
```
|
|
|
|
|
scancel -u alainm
|
|
|
|
|
|
|
|
|
|
ninja
|
|
|
|
|
```
|
|
|
|
|
|
|
|
|
|
run test on master to check we start with a clean situation
|
|
|
|
|
most of our clusters have a test script (jzTest.sh for Jean Zay, licTest.sh for licallo)
|
|
|
|
|
|
|
|
|
|
```
|
|
|
|
|
./contrib/dev/aaTest.sh
|
|
|
|
|
Passed 58 tests and failed 0 out of 58.
|
|
|
|
|
Test suite PASSED
|
|
|
|
|
|
|
|
|
|
If yout checked the branch already you do not need to check it again, go to the merge command:
|
|
|
|
|
|
|
|
|
|
```
|
|
|
|
|
git checkout 816-testing-streaming-instability
|
|
|
|
|
git merge master
|
|
|
|
|
```
|
|
|
|
|
|
|
|
|
|
FIX THIS
|
|
|
|
|
Auto-merging src/dustSpeciePlugin.cpp
|
|
|
|
|
CONFLICT (content): Merge conflict in src/dustSpeciePlugin.cpp
|
|
|
|
|
Automatic merge failed; fix conflicts and then commit the result.
|
|
|
|
|
|
|
|
|
|
```
|
|
|
|
|
ninja
|
|
|
|
|
./contrib/dev/aaTest.sh
|
|
|
|
|
Passed 58 tests and failed 0 out of 58.
|
|
|
|
|
```
|
|
|
|
|
|
|
|
|
|
Test suite PASSED you should have this
|
|
|
|
|
|
|
|
|
|
```
|
|
|
|
|
git checkout master
|
|
|
|
|
git merge 816-testing-streaming-instability
|
|
|
|
|
ninja
|
|
|
|
|
./contrib/dev/aaTest.sh
|
|
|
|
|
```
|
|
|
|
|
|
|
|
|
|
IF IT PASSES:
|
|
|
|
|
|
|
|
|
|
```
|
|
|
|
|
git push
|
|
|
|
|
|
|
|
|
|
```
|
|
|
|
|
### [Profiling with Extrae](Developer's-corner/Profiling with Extrae)
|
|
### [Profiling with Extrae](Developer's-corner/Profiling with Extrae)
|
|
|
|
|
|
|
|
|
|
|
| ... | | ... | |
