Skip to content

Commit

Permalink
remove pre-commit that conflict with precommit.ci (#72)
Browse files Browse the repository at this point in the history
Adding yaml formatter and remove pre-commit CI workflow since it is conflict with `precommit.ci`

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
  • Loading branch information
unkcpz and pre-commit-ci[bot] authored Oct 11, 2022
1 parent ef72672 commit 0aef8b8
Show file tree
Hide file tree
Showing 53 changed files with 342 additions and 366 deletions.
8 changes: 4 additions & 4 deletions .github/PULL_REQUEST_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

---
contact_links:
- name: AiiDA Users Forum
url: http://www.aiida.net/mailing-list/
about: For general questions and discussion
- name: AiiDA Users Forum
url: http://www.aiida.net/mailing-list/
about: For general questions and discussion
87 changes: 39 additions & 48 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -1,54 +1,45 @@
---
name: deploy

on:
push:
branches:
- master
push:
branches:
- master


jobs:
pre-commit:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up Python 3.8
uses: actions/setup-python@v2
with:
python-version: 3.8
- uses: pre-commit/[email protected]

deploy-gh-pages:
if: github.repository == 'aiidateam/aiida-code-registry'
needs: pre-commit
runs-on: ubuntu-latest
env:
COMMIT_AUTHOR: Deploy Action
COMMIT_AUTHOR_EMAIL: [email protected]

steps:
- uses: actions/checkout@v2
- run: git fetch --no-tags --prune --depth=1 origin +refs/heads/*:refs/remotes/origin/*

- name: Set up Python 3.8
uses: actions/setup-python@v2
with:
python-version: 3.8

- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -r ./.make_ghpages/requirements.txt
- name: Collect all setup info of computers/codes into a single JSON file.
run: |
python "${GITHUB_WORKSPACE}/.make_ghpages/generate_json.py"
cp -r "${GITHUB_WORKSPACE}/.make_ghpages/out" "${GITHUB_WORKSPACE}/out"
- name: update index.html
run: cp ./.make_ghpages/index.html out/

- name: Deploy 🚀
uses: JamesIves/[email protected]
with:
branch: gh-pages # The branch the action should deploy to.
folder: out # The folder the action should deploy.

deploy-gh-pages:
if: github.repository == 'aiidateam/aiida-code-registry'
runs-on: ubuntu-latest
env:
COMMIT_AUTHOR: Deploy Action
COMMIT_AUTHOR_EMAIL: [email protected]

steps:
- uses: actions/checkout@v2
- run: git fetch --no-tags --prune --depth=1 origin +refs/heads/*:refs/remotes/origin/*

- name: Set up Python 3.8
uses: actions/setup-python@v2
with:
python-version: 3.8

- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -r ./.make_ghpages/requirements.txt
- name: Collect all setup info of computers/codes into a single JSON file.
run: |
python "${GITHUB_WORKSPACE}/.make_ghpages/generate_json.py"
cp -r "${GITHUB_WORKSPACE}/.make_ghpages/out" "${GITHUB_WORKSPACE}/out"
- name: update index.html
run: cp ./.make_ghpages/index.html out/

- name: Deploy 🚀
uses: JamesIves/[email protected]
with:
branch: gh-pages # The branch the action should deploy to.
folder: out # The folder the action should deploy.
34 changes: 0 additions & 34 deletions .github/workflows/pre-commit.yml

This file was deleted.

25 changes: 25 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
---
name: continuous-integration

on: [push, pull_request]

jobs:

test_generate_json:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

- name: Set up Python 3.8
uses: actions/setup-python@v2
with:
python-version: 3.8

- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -r ./.make_ghpages/requirements.txt
- name: Collect all setup info of computers/codes into a single JSON file.
run: |-
python "${GITHUB_WORKSPACE}/.make_ghpages/generate_json.py"
26 changes: 10 additions & 16 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,18 +1,12 @@
---
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.3.0 # Use the ref you want to point at
hooks:
- id: trailing-whitespace
- id: check-yaml
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.3.0 # Use the ref you want to point at
hooks:
- id: trailing-whitespace
- id: check-yaml

- repo: https://github.com/adrienverge/yamllint.git
rev: v1.28.0
hooks:
- id: yamllint
args: [-c=.yamllint, -s]
# only check yaml files for codes and computers setting
exclude: >
(?x)^(
.github/.* |
.pre-commit-config.yaml |
)$
- repo: https://github.com/jumanjihouse/pre-commit-hook-yamlfmt
rev: 0.2.2
hooks:
- id: yamlfmt
14 changes: 7 additions & 7 deletions daint.cscs.ch/codes/cp2k-9.1-hybrid.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
---
label: "cp2k-9.1"
description: "CP2K compiled for daint-gpu"
input_plugin: "cp2k"
label: cp2k-9.1
description: CP2K compiled for daint-gpu
input_plugin: cp2k
on_computer: true
remote_abs_path: "/apps/dom/UES/jenkins/7.0.UP03/21.09/dom-gpu/software/CP2K/9.1-CrayGNU-21.09-cuda/bin/cp2k.psmp"
remote_abs_path: /apps/dom/UES/jenkins/7.0.UP03/21.09/dom-gpu/software/CP2K/9.1-CrayGNU-21.09-cuda/bin/cp2k.psmp
prepend_text: |
module load daint-gpu
module load CP2K
append_text: " "
module load daint-gpu
module load CP2K
append_text: ' '
14 changes: 7 additions & 7 deletions daint.cscs.ch/codes/cp2k-9.1-multicore.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
---
label: "cp2k-9.1"
description: "CP2K 9.1 compiled by CSCS"
input_plugin: "cp2k"
label: cp2k-9.1
description: CP2K 9.1 compiled by CSCS
input_plugin: cp2k
on_computer: true
remote_abs_path: "/apps/dom/UES/jenkins/7.0.UP03/21.09/dom-mc/software/CP2K/9.1-CrayGNU-21.09/bin/cp2k.psmp"
remote_abs_path: /apps/dom/UES/jenkins/7.0.UP03/21.09/dom-mc/software/CP2K/9.1-CrayGNU-21.09/bin/cp2k.psmp
prepend_text: |
module load daint-mc
module load CP2K
append_text: " "
module load daint-mc
module load CP2K
append_text: ' '
14 changes: 7 additions & 7 deletions daint.cscs.ch/codes/dos-7.0-multicore.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
---
label: "dos-7.0"
description: "QE dos.x compiled for daint-mc"
input_plugin: "quantumespresso.dos"
label: dos-7.0
description: QE dos.x compiled for daint-mc
input_plugin: quantumespresso.dos
on_computer: true
remote_abs_path: "/apps/dom/UES/jenkins/7.0.UP03/21.09/dom-mc/software/QuantumESPRESSO/7.0-CrayIntel-21.09/bin/dos.x"
remote_abs_path: /apps/dom/UES/jenkins/7.0.UP03/21.09/dom-mc/software/QuantumESPRESSO/7.0-CrayIntel-21.09/bin/dos.x
prepend_text: |
module load daint-mc
module load QuantumESPRESSO
append_text: " "
module load daint-mc
module load QuantumESPRESSO
append_text: ' '
14 changes: 7 additions & 7 deletions daint.cscs.ch/codes/pp-7.0-multicore.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
---
label: "pp-7.0"
description: "PP compiled for daint-mc"
input_plugin: "quantumespresso.pp"
label: pp-7.0
description: PP compiled for daint-mc
input_plugin: quantumespresso.pp
on_computer: true
remote_abs_path: "/apps/dom/UES/jenkins/7.0.UP03/21.09/dom-mc/software/QuantumESPRESSO/7.0-CrayIntel-21.09/bin/pp.x"
remote_abs_path: /apps/dom/UES/jenkins/7.0.UP03/21.09/dom-mc/software/QuantumESPRESSO/7.0-CrayIntel-21.09/bin/pp.x
prepend_text: |
module load daint-mc
module load QuantumESPRESSO
append_text: " "
module load daint-mc
module load QuantumESPRESSO
append_text: ' '
14 changes: 7 additions & 7 deletions daint.cscs.ch/codes/projwfc-7.0-multicore.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
---
label: "projwfc-7.0"
description: "PROJWFC compiled for daint-mc"
input_plugin: "quantumespresso.projwfc"
label: projwfc-7.0
description: PROJWFC compiled for daint-mc
input_plugin: quantumespresso.projwfc
on_computer: true
remote_abs_path: "/apps/dom/UES/jenkins/7.0.UP03/21.09/dom-mc/software/QuantumESPRESSO/7.0-CrayIntel-21.09/bin/projwfc.x"
remote_abs_path: /apps/dom/UES/jenkins/7.0.UP03/21.09/dom-mc/software/QuantumESPRESSO/7.0-CrayIntel-21.09/bin/projwfc.x
prepend_text: |
module load daint-mc
module load QuantumESPRESSO
append_text: " "
module load daint-mc
module load QuantumESPRESSO
append_text: ' '
14 changes: 7 additions & 7 deletions daint.cscs.ch/codes/pw-7.0-multicore.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
---
label: "pw-7.0"
description: "PW compiled for daint-mc"
input_plugin: "quantumespresso.pw"
label: pw-7.0
description: PW compiled for daint-mc
input_plugin: quantumespresso.pw
on_computer: true
remote_abs_path: "/apps/dom/UES/jenkins/7.0.UP03/21.09/dom-mc/software/QuantumESPRESSO/7.0-CrayIntel-21.09/bin/pw.x"
remote_abs_path: /apps/dom/UES/jenkins/7.0.UP03/21.09/dom-mc/software/QuantumESPRESSO/7.0-CrayIntel-21.09/bin/pw.x
prepend_text: |
module load daint-mc
module load QuantumESPRESSO
append_text: " "
module load daint-mc
module load QuantumESPRESSO
append_text: ' '
2 changes: 1 addition & 1 deletion daint.cscs.ch/hybrid-s1141/computer-configure.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
---
safe_interval: 60
proxy_command: "ssh -q -Y {username}@ela.cscs.ch netcat daint.cscs.ch 22"
proxy_command: ssh -q -Y {username}@ela.cscs.ch netcat daint.cscs.ch 22
30 changes: 15 additions & 15 deletions daint.cscs.ch/hybrid-s1141/computer-setup.yaml
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
---
label: "daint-hybrid-s1141"
hostname: "daint.cscs.ch"
description: "Piz Daint supercomputer at CSCS Lugano, Switzerland, using the hybrid partition. Project s1141"
transport: "ssh"
scheduler: "slurm"
shebang: "#!/bin/bash -l"
label: daint-hybrid-s1141
hostname: daint.cscs.ch
description: Piz Daint supercomputer at CSCS Lugano, Switzerland, using the hybrid partition. Project s1141
transport: ssh
scheduler: slurm
shebang: '#!/bin/bash -l'
mpiprocs_per_machine: 12
num_cores_per_mpiproc: 1
queue_name: normal
work_dir: "/scratch/snx3000/{username}/aiida/"
mpirun_command: "srun -n {tot_num_mpiprocs}"
work_dir: /scratch/snx3000/{username}/aiida/
mpirun_command: srun -n {tot_num_mpiprocs}
prepend_text: |
#SBATCH --partition=normal
#SBATCH --account=s1141
#SBATCH --constraint=gpu
export OMP_NUM_THREADS=${SLURM_CPUS_PER_TASK:-1}
source $MODULESHOME/init/bash
export CRAY_CUDA_MPS=1
ulimit -s unlimited
#SBATCH --partition=normal
#SBATCH --account=s1141
#SBATCH --constraint=gpu
export OMP_NUM_THREADS=${SLURM_CPUS_PER_TASK:-1}
source $MODULESHOME/init/bash
export CRAY_CUDA_MPS=1
ulimit -s unlimited
2 changes: 1 addition & 1 deletion daint.cscs.ch/hybrid/computer-configure.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
---
safe_interval: 60
proxy_command: "ssh -q -Y {username}@ela.cscs.ch netcat daint.cscs.ch 22"
proxy_command: ssh -q -Y {username}@ela.cscs.ch netcat daint.cscs.ch 22
32 changes: 16 additions & 16 deletions daint.cscs.ch/hybrid/computer-setup.yaml
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
---
label: "daint-hybrid"
hostname: "daint.cscs.ch"
description: "Piz Daint supercomputer at CSCS Lugano, Switzerland, using the hybrid partition. HyperThreading is off"
transport: "ssh"
scheduler: "slurm"
shebang: "#!/bin/bash -l"
label: daint-hybrid
hostname: daint.cscs.ch
description: Piz Daint supercomputer at CSCS Lugano, Switzerland, using the hybrid partition. HyperThreading is off
transport: ssh
scheduler: slurm
shebang: '#!/bin/bash -l'
mpiprocs_per_machine: 12
num_cores_per_mpiproc: 1
queue_name: normal
work_dir: "/scratch/snx3000/{username}/aiida/"
mpirun_command: "srun -n {tot_num_mpiprocs}"
work_dir: /scratch/snx3000/{username}/aiida/
mpirun_command: srun -n {tot_num_mpiprocs}
prepend_text: |
### computer prepend_text start ###
#SBATCH --partition=normal
#SBATCH --constraint=gpu
#SBATCH --hint=nomultithread
export OMP_NUM_THREADS=$SLURM_CPUS_PER_TASK
export CRAY_CUDA_MPS=1
ulimit -s unlimited
### computer prepend_text end ###
### computer prepend_text start ###
#SBATCH --partition=normal
#SBATCH --constraint=gpu
#SBATCH --hint=nomultithread
export OMP_NUM_THREADS=$SLURM_CPUS_PER_TASK
export CRAY_CUDA_MPS=1
ulimit -s unlimited
### computer prepend_text end ###
2 changes: 1 addition & 1 deletion daint.cscs.ch/multicore/computer-configure.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
---
safe_interval: 60
proxy_command: "ssh -q -Y {username}@ela.cscs.ch netcat daint.cscs.ch 22"
proxy_command: ssh -q -Y {username}@ela.cscs.ch netcat daint.cscs.ch 22
Loading

0 comments on commit 0aef8b8

Please sign in to comment.