diff --git a/.github/workflows/python-package-conda.yml b/.github/workflows/python-package-conda.yml index 386b047..66353dc 100644 --- a/.github/workflows/python-package-conda.yml +++ b/.github/workflows/python-package-conda.yml @@ -8,7 +8,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, macOS-latest] + os: [ubuntu-latest, macOS-latest, windows-latest] python-version: [3.7] steps: - uses: actions/checkout@v2 @@ -17,8 +17,8 @@ jobs: - name: install mamba uses: mamba-org/provision-with-micromamba@main with: - environment-file: CNN.yml - environment-name: CNN + environment-file: PINN.yml + environment-name: PINN - name: Install test packages shell: bash -l {0} run: | @@ -30,4 +30,4 @@ jobs: - name: Test with pytest shell: bash -l {0} run: | - pytest .github/workflows/test_CNN_notebooks.py + pytest .github/workflows/test_notebooks.py diff --git a/.github/workflows/test_CNN_notebooks.py b/.github/workflows/test_notebooks.py similarity index 97% rename from .github/workflows/test_CNN_notebooks.py rename to .github/workflows/test_notebooks.py index 2480951..f9bd2cc 100644 --- a/.github/workflows/test_CNN_notebooks.py +++ b/.github/workflows/test_notebooks.py @@ -26,7 +26,7 @@ def _find_notebooks(): ) # Get just the notebooks from the git files - notebooks_files = [Path(fn) for fn in git_files if fn.endswith("CNN_Volcanic_deformation_test.ipynb")] + notebooks_files = [Path(fn) for fn in git_files if fn.endswith("PINNs_1DHeatEquationExample.ipynb")] # remove all notebooks that haven't been checked notebooks_files = [p for p in notebooks_files if p.parent.name != "unchecked"] diff --git a/.github/workflows/windows_python_package.yml b/.github/workflows/windows_python_package.yml deleted file mode 100644 index 75bfc7d..0000000 --- a/.github/workflows/windows_python_package.yml +++ /dev/null @@ -1,33 +0,0 @@ -name: Python Package using Conda -on: [push] - -jobs: - test: - name: Test python ${{ matrix.python-version }} on ${{ matrix.os }} - - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [windows-latest] - python-version: [3.7] - steps: - - uses: actions/checkout@v2 - with: - submodules: recursive - - name: install mamba - uses: mamba-org/provision-with-micromamba@main - with: - environment-file: CNN_windows.yml - environment-name: CNN - - name: Install test packages - shell: bash -l {0} - run: | - pip install pytest nbconvert nbformat - - name: which python - shell: bash -l {0} - run: | - which python - - name: Test with pytest - shell: bash -l {0} - run: | - pytest .github/workflows/test_CNN_notebooks.py diff --git a/PINN.yml b/PINN.yml index 8b0c4d7..a28ae01 100644 --- a/PINN.yml +++ b/PINN.yml @@ -1,4 +1,4 @@ -name: PINN2 +name: PINN channels: - conda-forge - defaults diff --git a/binder/environment.yml b/binder/environment.yml new file mode 100644 index 0000000..a28ae01 --- /dev/null +++ b/binder/environment.yml @@ -0,0 +1,14 @@ +name: PINN +channels: + - conda-forge + - defaults +dependencies: + - python + - notebook + - matplotlib + - scipy + - pandas + - pip + - pip: + - pyDOE + - tensorflow>2.1