Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,9 @@ jobs:
- name: Install all extras - CI
shell: micromamba-shell {0}
working-directory: ARC
env:
MAMBA_ALWAYS_YES: "true"
CONDA_ALWAYS_YES: "true"
run: make install-ci

- name: Set TS-GCN and AutoTST in PYTHONPATH
Expand All @@ -111,15 +114,15 @@ jobs:
run: |
echo "Running Unit Tests..."
export PYTHONPATH="${{ github.workspace }}/AutoTST:${{ github.workspace }}/KinBot:$PYTHONPATH"
pytest arc/ --cov --cov-report=xml -ra -vv
pytest arc/ --cov --cov-report=xml -ra -vv -n auto

- name: Run Functional Tests
shell: micromamba-shell {0}
working-directory: ${{ github.workspace }}/ARC
run: |
echo "Running Functional Tests from $(pwd)..."
export PYTHONPATH="${{ github.workspace }}/AutoTST:${{ github.workspace }}/KinBot:$PYTHONPATH"
pytest functional/ -ra -vv
pytest functional/ -ra -vv -n auto

- name: Upload coverage data
uses: codecov/codecov-action@v3
Expand Down
30 changes: 1 addition & 29 deletions .github/workflows/update-cache.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,32 +111,4 @@ jobs:
ref: v2.0.6
fetch-depth: 1

# ────────── Conda package cache ──────────
- name: Cache Conda packages
id: cache-conda-pkgs
uses: actions/cache@v4
with:
path: ~/conda_pkgs_dir
key: ${{ runner.os }}-conda-0-${{ hashFiles('environment.yml') }}

# ────────── Create / restore env ──────────
- name: Setup ARC Env
uses: conda-incubator/setup-miniconda@v3.2.0
with:
auto-update-conda: true
environment-file: environment.yml
activate-environment: arc_env
miniconda-version: latest
conda-solver: libmamba

# ────────── Update env & save to cache ──────────
- name: Update environment
run: conda env update -n arc_env -f environment.yml

- name: Cache ARC env
if: github.event_name == 'push'
uses: actions/cache@v4
with:
path: ${{ env.CONDA }}/envs
key: conda-${{ runner.os }}-${{ runner.arch }}-0

# ────────── Env caching handled in CI workflow ──────────
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,13 @@ help:
test: test-unittests

test-unittests:
pytest arc/ --cov --cov-report=xml -ra -vv
pytest arc/ --cov --cov-report=xml -ra -vv -n auto

test-functional:
pytest functional/ -ra -vv
pytest functional/ -ra -vv -n auto

test-all:
pytest arc/ functional/ --cov --cov-report=xml -ra -vv
pytest arc/ functional/ --cov --cov-report=xml -ra -vv -n auto

install-all: install

Expand Down
4 changes: 2 additions & 2 deletions devtools/install_rmg.sh
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,10 @@ fi

if $COMMAND_PKG env list | awk '{print $1}' | grep -qx "$ENV_NAME"; then
echo ">>> Updating existing environment: $ENV_NAME"
$COMMAND_PKG env update -n "$ENV_NAME" -f environment.yml --prune
$COMMAND_PKG env update -n "$ENV_NAME" -f environment.yml --prune --strict-channel-priority
else
echo ">>> Creating new environment: $ENV_NAME"
$COMMAND_PKG env create -n "$ENV_NAME" -f environment.yml -y
$COMMAND_PKG env create -n "$ENV_NAME" -f environment.yml -y --strict-channel-priority
fi

###############################################################################
Expand Down
2 changes: 1 addition & 1 deletion devtools/install_torchani.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
set -euo pipefail
set -eo pipefail

# Enable tracing of each command, but tee it to a logfile
exec 3>&1 4>&2
Expand Down
12 changes: 6 additions & 6 deletions devtools/tani_environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ channels:
- conda-forge
- defaults
dependencies:
- python
- numpy
- python =3.10.8
- numpy =1.24
- pandas
- ase
- torchani >=2.2.3
- pytorch
- torchvision
- torchaudio
- torchani =2.2
- pytorch =1.13.1
- torchvision =0.14.1
- torchaudio =0.13.1
- cpuonly
- scikit-learn
- matplotlib
Expand Down
1 change: 1 addition & 0 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ dependencies:
- conda-forge::pytables
- conda-forge::pytest
- conda-forge::pytest-cov
- conda-forge::pytest-xdist
- conda-forge::pyyaml
- conda-forge::rdkit >=2025.03
- conda-forge::scipy
Expand Down
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ sphinxcontrib-jsmath
# For running the unit tests
pytest
pytest-cov
pytest-xdist
coverage

# For interactive use
Expand Down
Loading