Fix merge conflict for compile (2e35361e) · Commits · UEABS / ueabs

Commit 2e35361e authored 3 years ago by

Cedric Jourdain

Browse files

Fix merge conflict for compile

parents 2a1e952f c8fbc69a

Branches

Tags

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

README.md 1 addition, 1 deletion

README.md
gpaw/README.md 7 additions, 7 deletions

gpaw/README.md
gpaw/build/build-CPU.md 17 additions, 17 deletions

gpaw/build/build-CPU.md
gpaw/build/examples/BSC-MareNostrum4-skylake/build_20.1.0_Python38_FFTW_icc.BSC.sh 1072 additions, 0 deletions

...areNostrum4-skylake/build_20.1.0_Python38_FFTW_icc.BSC.sh
gpaw/build/examples/BSC-MareNostrum4-skylake/build_20.10.0_Python39_FFTW_icc.BSC.sh 1073 additions, 0 deletions

...reNostrum4-skylake/build_20.10.0_Python39_FFTW_icc.BSC.sh
gpaw/build/examples/HLRS-Hawk-rome/build_20.1.0_Python38_FFTW_icc.HLRS.sh 1071 additions, 0 deletions

...les/HLRS-Hawk-rome/build_20.1.0_Python38_FFTW_icc.HLRS.sh
gpaw/build/examples/HLRS-Hawk-rome/build_20.1.0_Python38_FFTW_icc_ompi.HLRS.sh 1071 additions, 0 deletions

...LRS-Hawk-rome/build_20.1.0_Python38_FFTW_icc_ompi.HLRS.sh
gpaw/build/examples/HLRS-Hawk-rome/build_20.10.0_Python39_FFTW_icc.HLRS.sh 1072 additions, 0 deletions

...es/HLRS-Hawk-rome/build_20.10.0_Python39_FFTW_icc.HLRS.sh
gpaw/build/examples/HLRS-Hawk-rome/build_20.10.0_Python39_FFTW_icc_ompi.HLRS.sh 1072 additions, 0 deletions

...RS-Hawk-rome/build_20.10.0_Python39_FFTW_icc_ompi.HLRS.sh
gpaw/build/examples/JSC-JUWELS-skylake/build_20.1.0_Python38_FFTW_icc.JSC.sh 1019 additions, 0 deletions

.../JSC-JUWELS-skylake/build_20.1.0_Python38_FFTW_icc.JSC.sh
gpaw/build/examples/JSC-JUWELS-skylake/build_20.10.0_Python39_FFTW_icc.JSC.sh 1027 additions, 0 deletions

...JSC-JUWELS-skylake/build_20.10.0_Python39_FFTW_icc.JSC.sh
gpaw/build/examples/LRZ-SuperMUCng-skylake/README.md 45 additions, 0 deletions

gpaw/build/examples/LRZ-SuperMUCng-skylake/README.md
gpaw/build/examples/LRZ-SuperMUCng-skylake/build_20.1.0_Python38_FFTW_icc.LRZ.sh 1078 additions, 0 deletions

...-SuperMUCng-skylake/build_20.1.0_Python38_FFTW_icc.LRZ.sh
gpaw/build/examples/LRZ-SuperMUCng-skylake/build_20.10.0_Python39_FFTW_icc.LRZ.sh 1074 additions, 0 deletions

...SuperMUCng-skylake/build_20.10.0_Python39_FFTW_icc.LRZ.sh
gpaw/build/examples/README.md 73 additions, 30 deletions

gpaw/build/examples/README.md
gpaw/build/examples/TGCC-Irene-rome/build_20.1.0_Python38_FFTW_icc.TGCC.rome.sh 1111 additions, 0 deletions

...CC-Irene-rome/build_20.1.0_Python38_FFTW_icc.TGCC.rome.sh
gpaw/build/examples/TGCC-Irene-rome/build_20.10.0_Python39_FFTW_icc.TGCC.rome.sh 1110 additions, 0 deletions

...C-Irene-rome/build_20.10.0_Python39_FFTW_icc.TGCC.rome.sh
gpaw/build/examples/davide/gpaw-cpu/build.sh 0 additions, 32 deletions

gpaw/build/examples/davide/gpaw-cpu/build.sh
gpaw/build/examples/davide/gpaw-cpu/setup/customize-power8.py 0 additions, 39 deletions

.../build/examples/davide/gpaw-cpu/setup/customize-power8.py
gpaw/build/examples/davide/gpaw-cpu/setup/load-gpaw.sh 0 additions, 11 deletions

gpaw/build/examples/davide/gpaw-cpu/setup/load-gpaw.sh

with 12993 additions and 137 deletions

Please register or to comment