Skip to content

Commit

Permalink
Fix A-star CXX compability error (#84)
Browse files Browse the repository at this point in the history
  • Loading branch information
rogerwwww authored Nov 7, 2023
1 parent 6ddb482 commit 675d256
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 10 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
# exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
- name: Test with pytest. They are divided into two runs because MindSpore will interfer with Paddle.
- name: Test with pytest. They are divided into two runs because MindSpore will interfere with Paddle.
run: |
if [ "${{ matrix.python-version }}" != "3.10" ]; then
pytest --cov=pygmtools --cov-report=xml --backend=mindspore tests/test_classic_solvers.py; fi
Expand Down Expand Up @@ -76,7 +76,7 @@ jobs:
flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
# exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
- name: Test with pytest. They are divided into two runs because MindSpore will interfer with Paddle.
- name: Test with pytest. They are divided into two runs because MindSpore will interfere with Paddle.
run: |
pytest --cov=pygmtools --cov-report=xml --backend=mindspore tests/test_classic_solvers.py
pytest --cov=pygmtools --cov-report=xml --cov-append
Expand Down Expand Up @@ -108,7 +108,7 @@ jobs:
flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
# exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
- name: Test with pytest. They are divided into two runs because MindSpore will interfer with Paddle.
- name: Test with pytest. They are divided into two runs because MindSpore will interfere with Paddle.
run: |
pytest --cov=pygmtools --cov-report=xml --backend=mindspore tests/test_classic_solvers.py
pytest --cov=pygmtools --cov-report=xml --cov-append
11 changes: 6 additions & 5 deletions .github/workflows/python-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:

jobs:
deploy:
runs-on: ubuntu-latest
runs-on: ubuntu-20.04

steps:
- uses: actions/checkout@v2
Expand All @@ -27,6 +27,7 @@ jobs:
python -m pip install --upgrade pip
pip install wheel
pip install cython
pip install setuptools
- name: Build package
run: python setup.py sdist
- name: Upload new version to PyPI
Expand All @@ -40,7 +41,7 @@ jobs:

linux:
needs: deploy
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
strategy:
fail-fast: false
matrix:
Expand All @@ -55,7 +56,7 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -r docs/publish_req.txt
pip install -r pygmtools/publish_requirements.txt
- name: Build Wheel
run: |
python setup.py bdist_wheel
Expand Down Expand Up @@ -85,7 +86,7 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -r docs/publish_req.txt
pip install -r pygmtools/publish_requirements.txt
- name: Build Wheel
run: |
python setup.py bdist_wheel
Expand Down Expand Up @@ -114,7 +115,7 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -r docs/publish_req.txt
pip install -r pygmtools/publish_requirements.txt
- name: Build Wheel
run: |
python setup.py bdist_wheel
Expand Down
2 changes: 1 addition & 1 deletion pygmtools/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
from .neural_solvers import pca_gm, ipca_gm, cie, ngm, genn_astar
import pygmtools.utils as utils
BACKEND = 'numpy'
__version__ = '0.4.1'
__version__ = '0.4.2a2'
__author__ = 'ThinkLab at SJTU'


Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
numpy
cython
wheel
torch
torch

0 comments on commit 675d256

Please sign in to comment.