-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #202 from SNLComputation/python_to_pybind11
Switch from SWIG to pybind11 for Python interface and compadre->pycompadre
- Loading branch information
Showing
217 changed files
with
42,532 additions
and
8,415 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| include * | ||
| recursive-include * * | ||
| prune .git | ||
| prune .eggs | ||
| prune build | ||
| prune dist |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 1.0.3 | ||
| 1.0.7 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| echo "Compadre_USE_MPI:BOOL=OFF" > $RECIPE_DIR/cmake_opts.txt | ||
| echo "PYTHON_EXECUTABLE=$PYTHON" >> $RECIPE_DIR/cmake_opts.txt | ||
| if [ "$OSX_ARCH" != "" ]; then | ||
| echo "BLAS_LIBRARY_DIRS=/System/Library/Frameworks/Accelerate.framework//Versions/A/Frameworks/vecLib.framework/Versions/A/" >> $RECIPE_DIR/cmake_opts.txt | ||
| echo "LAPACK_LIBRARY_DIRS=/System/Library/Frameworks/Accelerate.framework//Versions/A/Frameworks/vecLib.framework/Versions/A/" >> $RECIPE_DIR/cmake_opts.txt | ||
| fi | ||
| CMAKE_CONFIG_FILE=$RECIPE_DIR/cmake_opts.txt $PYTHON setup.py install |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| Compadre_USE_MPI:BOOL=OFF |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| import re | ||
| import sys | ||
|
|
||
| assert len(sys.argv) > 1, "Input argument for version missing." | ||
| if (len(sys.argv) > 1): | ||
| version = str(sys.argv[1]) | ||
|
|
||
| with open ('../cmake/Compadre_Version.txt', 'w' ) as f: | ||
| f.write(version) | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,129 @@ | ||
| #!/bin/bash | ||
|
|
||
| # if looking to install the package, just run 'pip install .' from the root directory of the repo. | ||
|
|
||
| # for creating a pypi package, run: | ||
| # >> python setup.py sdist | ||
| # >> twine upload dist/* | ||
|
|
||
| # | ||
| # This file handles installation and packaging of the python interface for the Compadre Toolkit | ||
| # Execute this file with a -i or --install flag and it will build and install this package | ||
| # | ||
|
|
||
| for i in "$@" | ||
| do | ||
| case $i in | ||
| -e=*|--executable=*) | ||
| EXECUTABLE="${i#*=}" | ||
| shift # passed argument=value | ||
| ;; | ||
| -c|--clean) | ||
| CLEAN=YES | ||
| shift # passed argument with no value | ||
| ;; | ||
| -p|--package) | ||
| PACKAGE=YES | ||
| shift # passed argument with no value | ||
| ;; | ||
| -P|--PACKAGE) | ||
| PACKAGE=YES | ||
| shift # passed argument with no value | ||
| ;; | ||
| -C|--conda) | ||
| CONDA=YES | ||
| shift # passed argument with no value | ||
| ;; | ||
| -h|--help) | ||
| HELP=YES | ||
| shift # passed argument with no value | ||
| ;; | ||
| *) | ||
| # unknown option | ||
| ;; | ||
| esac | ||
| done | ||
|
|
||
| # install the python package of compadre for the user | ||
| if [ "$HELP" == "YES" ]; then | ||
|
|
||
| echo "-e | --executable Python executable to be used for package installation" | ||
| echo "-c | --clean Removes temporary files created by packaging and installation" | ||
| echo "-p | --package Create a python package that can be uploaded to Pypi" | ||
| echo "-h | --help See the help screen that you are currently reading" | ||
| echo "-v= | --version= (OPTIONAL UNLESS PACKAGING)" | ||
| exit 0 | ||
|
|
||
| fi | ||
|
|
||
| # remove temporary files created by install and packaging | ||
| if [ "$CLEAN" == "YES" ]; then | ||
| rm -r ../dist | ||
| rm -r ../pycompadre.egg-info | ||
| exit 0 | ||
| fi | ||
|
|
||
| # output variables used | ||
| echo "CONDA: ${CONDA}" | ||
| if [ "$EXECUTABLE" == "" ]; then | ||
| EXECUTABLE=`which python` | ||
| echo "$0: No Python executable provided with \" -e=*\", so first python found in search path is used: $EXECUTABLE" | ||
| fi | ||
| echo "PYTHON EXECUTABLE: ${EXECUTABLE}" | ||
|
|
||
| # (NOT for users) create a python package that can be uploaded to pypi | ||
| if [ "$PACKAGE" == "YES" ]; then | ||
|
|
||
|
|
||
| rm -rf ../dist | ||
| rm -rf ../build | ||
| rm -rf ../meta.yaml | ||
| rm -rf ../build.sh | ||
| rm -rf ../pycompadre.egg-info | ||
| cp cmake_opts.txt .. | ||
|
|
||
| cd .. | ||
|
|
||
| CMAKE_CONFIG_FILE=cmake_opts.txt $EXECUTABLE setup.py bdist_wheel sdist | ||
| echo "bdist_wheel and sdist complete." | ||
|
|
||
| cd pycompadre | ||
| # follow up with twine upload ../dist/* | ||
|
|
||
| fi | ||
|
|
||
| # (NOT for users) create a conda package | ||
| if [ "$CONDA" == "YES" ]; then | ||
|
|
||
| # conda activate builder | ||
| # conda build purge-all | ||
| # conda-bld should be cleared as well | ||
|
|
||
|
|
||
| rm -rf ../dist | ||
| rm -rf ../build | ||
| rm -rf ../meta.yaml | ||
| rm -rf ../build.sh | ||
| rm -rf ../pycompadre.egg-info | ||
| cp cmake_opts.txt .. | ||
|
|
||
| #cp update_conda_cmake.py ../update_conda_cmake.py | ||
| # named *.in so that they are not picked up by conda in the pycompadre folder | ||
| cp meta.yaml.in ../meta.yaml | ||
| cp build.sh.in ../build.sh | ||
| #cp conda_build_config.yaml.in ../conda_build_config.yaml | ||
| cd .. | ||
| conda-build . --python=2.7 --python=3.5 --python=3.6 --python=3.7 --python=3.8 | ||
| #--python=3.5 | ||
| #--python=3.7 | ||
| # --python=3.6 --python=3.7 | ||
| cd pycompadre | ||
|
|
||
| fi | ||
|
|
||
| # instructions for updating conda package | ||
| # 1.) git fetch origin on compadre repo | ||
| # 2.) from the root of the repo, with master checked out, run >> git merge origin/conda_files --allow-unrelated-histories | ||
| # 3.) >> conda-build . --python=3.6 --python=3.7 --python=3.8 | ||
| # 4.) >> anaconda login | ||
| # 5.) >> anaconda upload /some/path/to/compadre.tar.bz2 |
Oops, something went wrong.