Skip to content

Commit

Permalink
PyPI Version 0.3.5
Browse files Browse the repository at this point in the history
  • Loading branch information
lpossner committed Oct 1, 2023
1 parent 3f3ab60 commit f47212e
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 38 deletions.
32 changes: 13 additions & 19 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,12 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.8", "3.9", "3.10"]
python-version: ["3.10", "3.11"]
include:
- python-version: "3.8"
cibw-string: "cp38-*"
- python-version: "3.9"
cibw-string: "cp39-*"
- python-version: "3.10"
cibw-string: "cp310-*"
- python-version: "3.11"
cibw-string: "cp311-*"
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
Expand Down Expand Up @@ -55,14 +53,12 @@ jobs:
runs-on: windows-latest
strategy:
matrix:
python-version: ["3.8", "3.9", "3.10"]
python-version: ["3.10", "3.11"]
include:
- python-version: "3.8"
cibw-string: "cp38-*"
- python-version: "3.9"
cibw-string: "cp39-*"
- python-version: "3.10"
cibw-string: "cp310-*"
- python-version: "3.11"
cibw-string: "cp311-*"
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
Expand Down Expand Up @@ -98,14 +94,12 @@ jobs:
runs-on: macos-latest
strategy:
matrix:
python-version: ["3.8", "3.9", "3.10"]
python-version: ["3.10", "3.11"]
include:
- python-version: "3.8"
cibw-string: "cp38-*"
- python-version: "3.9"
cibw-string: "cp39-*"
- python-version: "3.10"
cibw-string: "cp310-*"
- python-version: "3.11"
cibw-string: "cp311-*"
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
Expand All @@ -114,11 +108,11 @@ jobs:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
brew install gcc@9
brew install gcc@13
python -m pip install --upgrade pip
pip install Cython matplotlib seaborn cibuildwheel twine
pip install -r requirements.txt
CC=gcc-9 CXX=g++-9 pip install .
CC=gcc-13 CXX=g++-13 pip install .
- name: Test with unittest
run: |
cd tests
Expand All @@ -132,8 +126,8 @@ jobs:
CIBW_BEFORE_BUILD: "pip install numpy"
CIBW_BUILD: ${{ matrix.cibw-string }}
CIBW_REPAIR_WHEEL_COMMAND: "delocate-listdeps {wheel} && delocate-wheel -w {dest_dir} {wheel}"
CC: gcc-9
CXX: g++-9
CC: gcc-13
CXX: g++-13
- name: Upload with twine
if: "contains(github.event.head_commit.message, 'PyPI')"
run: |
Expand Down
22 changes: 3 additions & 19 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# analysis of complex systems. See also:
# https://github.com/pygpc-polynomial-chaos/pygpc
#
# Copyright (C) 2017-2022 the original author (Konstantin Weise),
# Copyright (C) 2017-2023 the original author (Konstantin Weise),
# the Max-Planck-Institute for Human Cognitive Brain Sciences ("MPI CBS")
# and contributors
#
Expand Down Expand Up @@ -41,7 +41,7 @@


setup(name='pygpc',
version='0.3.4',
version='0.3.5',
description='A sensitivity and uncertainty analysis toolbox for Python',
author='Konstantin Weise',
author_email='[email protected]',
Expand All @@ -64,20 +64,4 @@
"Documentation": "https://pygpc.readthedocs.io/en/latest/",
"Source Code": "https://github.com/pygpc-polynomial-chaos/pygpc"},
zip_safe=False,
include_package_data=True)


"""
Notes for Mac M1 users:
1. You’ll need to install: llvm and libomp from homebrew (be sure it’s arm versions).
2. You’ll need to prepend llvm path (by default it’s /opt/homebrew/opt/llvm/bin) so system clang compilers from llvm (I did it with version 16)
3. You’ll need to setup LDFLAGS and CPPFLAGS flags to include BOTH llvm and libomp so:
LDFLAGS = “-L/opt/homebrew/opt/llvm/lib -L/opt/homebrew/opt/libomp/lib”
CPPFLAFS = “-I/opt/homebrew/opt/llvm/include -I/opt/homebrew/opt/libomp/include”
(of course these are the default location… you can get the location with brew info llvm and brew info libomp)
4. Finally, you just need to change openmp_link_args inside setup.py for pyGPC to “-lomp” instead of “-lgomp”
"""
include_package_data=True)

0 comments on commit f47212e

Please sign in to comment.