-
Notifications
You must be signed in to change notification settings - Fork 25
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add Mac os x installation scripts #46
Open
nsryan2
wants to merge
33
commits into
pyne:main
Choose a base branch
from
nsryan2:add_mac
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
33 commits
Select commit
Hold shift + click to select a range
60efffc
Merge pull request #1 from pyne/main
nsryan2 f14554f
create a macosx sh file
nsryan2 eabc212
Create macosx install script from mint script
nsryan2 401d66e
change dependency list name
nsryan2 f6b8edd
Update brew and pip install lines to include elements of the ubuntu p…
nsryan2 7432182
Apply suggestions from code review
nsryan2 48abe72
Update build moab script and add build dagmc to operate with cmake
nsryan2 1d3b0d8
Add eigen to list of brew package installs
nsryan2 df3f162
Add hdf5 to the packages
nsryan2 655ac35
Remove references to hdf5_libdir
nsryan2 798a948
Remove references to hdf5_libdir
nsryan2 8fa80d8
Apply suggestions from code review
nsryan2 0892a60
Update macosx.sh
nsryan2 de30a2c
Update macosx.sh
nsryan2 e1b4d0e
Apply suggestions from code review
nsryan2 d0ef93a
Remove reference to python 2
nsryan2 234e758
add chmod=+x to the install_scripts folder
nsryan2 cadaae6
Merge branch 'add_mac' into main
nsryan2 cfb92d1
Merge pull request #2 from nsryan2/main
nsryan2 6542c38
Delete osx_10.15.6-stable.dockerfile
nsryan2 a66978b
Delete .DS_Store
nsryan2 7c30f01
this should now be working
bam241 7f9cbba
Merge branch 'add_mac' of https://github.com/nsryan2/install_scripts …
bam241 71b765e
cleaning
bam241 d0ad7a6
Merge pull request #3 from bam241/some_fix
nsryan2 3d32f49
Update macosx.sh
nsryan2 b6f7e77
Update macosx.sh
nsryan2 e1facd1
Add the curly brackets around variables
nsryan2 1f4b113
this should be the last one
bam241 266a31a
Merge pull request #5 from bam241/some_fix
nsryan2 2e4facc
convergence in macos and ubuntu scripts
gonuke b6a126c
Merge pull request #6 from gonuke/add_mac
nsryan2 1c06a88
Apply suggestions from code review
nsryan2 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,144 @@ | ||
#!/bin/bash | ||
# This script contains common code for building PyNE on various Debian-derived systems | ||
# | ||
|
||
function check_repo() { | ||
|
||
repo_name=$1 | ||
|
||
if [ -d ${repo_name} ] ; then | ||
read -p "Delete the existing ${repo_name} directory and all contents? (y/n) " -n 1 -r | ||
if [[ $REPLY =~ ^[Yy]$ ]] ; then | ||
rm -rf ${repo_name} | ||
fi | ||
fi | ||
|
||
} | ||
|
||
function build_moab { | ||
|
||
# Install MOAB | ||
cd ${install_dir} | ||
mkdir -p moab | ||
cd moab | ||
check_repo moab-repo | ||
git clone --branch Version5.1.0 --single-branch https://bitbucket.org/fathomteam/moab moab-repo | ||
cd moab-repo | ||
mkdir -p build | ||
cd build | ||
cmake ../ -DENABLE_HDF5=ON \ | ||
-DBUILD_SHARED_LIBS=ON \ | ||
-DENABLE_PYMOAB=ON \ | ||
-DENABLE_BLASLAPACK=OFF \ | ||
-DENABLE_FORTRAN=OFF \ | ||
-DCMAKE_INSTALL_PREFIX=${install_dir}/moab | ||
make | ||
make install | ||
|
||
echo "if [ -n \"\${LD_LIBRARY_PATH-}\" ]" >> ~/.bashrc | ||
echo "then" >> ~/.bashrc | ||
echo " export LD_LIBRARY_PATH=${install_dir}/moab/lib:\$LD_LIBRARY_PATH" >> ~/.bashrc | ||
echo "else" >> ~/.bashrc | ||
echo " export LD_LIBRARY_PATH=${install_dir}/moab/lib" >> ~/.bashrc | ||
echo "fi" >> ~/.bashrc | ||
|
||
PYTHON_VERSION=$(python -c 'import sys; print(sys.version.split('')[0][0:3])') | ||
echo "if [ -n \"\${PYTHONPATH-}\" ]" >> ~/.bashrc | ||
echo "then" >> ~/.bashrc | ||
echo " export PYTHONPATH=${install_dir}/moab/lib/python${PYTHON_VERSION}/site-packages:\$PYTHONPATH" >> ~/.bashrc | ||
echo "else" >> ~/.bashrc | ||
echo " export PYTHONPATH=${install_dir}/moab/lib/python${PYTHON_VERSION}/site-packages" >> ~/.bashrc | ||
echo "fi" >> ~/.bashrc | ||
source ~/.bashrc | ||
} | ||
|
||
function build_dagmc { | ||
|
||
# Install DAGMC | ||
cd ${install_dir} | ||
check_repo dagmc | ||
mkdir -p dagmc | ||
cd dagmc | ||
git clone https://github.com/svalinn/DAGMC.git dagmc-repo | ||
cd dagmc-repo | ||
git checkout develop | ||
mkdir build | ||
cd build | ||
cmake .. -DMOAB_DIR=${install_dir}/moab \ | ||
-DBUILD_STATIC_LIBS=OFF \ | ||
-DCMAKE_INSTALL_PREFIX=${install_dir}/dagmc | ||
make | ||
make install | ||
} | ||
|
||
function install_pyne { | ||
|
||
# Install PyNE | ||
cd ${install_dir} | ||
check_repo pyne | ||
git clone https://github.com/pyne/pyne.git | ||
cd pyne | ||
if [ $1 == 'stable' ] ; then | ||
TAG=$(git describe --abbrev=0 --tags) | ||
git checkout tags/`echo ${TAG}` -b `echo ${TAG}` | ||
fi | ||
|
||
|
||
python setup.py install --user -- -DMOAB_LIBRARY=${install_dir}/moab/lib \ | ||
-DMOAB_INCLUDE_DIR=${install_dir}/moab/include \ | ||
--dagmc ${install_dir}/dagmc \ | ||
--clean | ||
|
||
echo "export PATH=${HOME}/.local/bin:\$PATH" >> ~/.bashrc | ||
echo "export LD_LIBRARY_PATH=${HOME}/.local/lib:\$LD_LIBRARY_PATH" >> ~/.bashrc | ||
|
||
PYTHON_VERSION=$(python -c 'import sys; print(sys.version.split('')[0][0:3])') | ||
echo "if [ -n \"\${PYTHONPATH-}\" ]" >> ~/.bashrc | ||
echo "then" >> ~/.bashrc | ||
echo " export PYTHONPATH=~/.local/lib/python${PYTHON_VERSION}/site-packages:\$PYTHONPATH" >> ~/.bashrc | ||
echo "else" >> ~/.bashrc | ||
echo " export PYTHONPATH=~/.local/lib/python${PYTHON_VERSION}/site-packages" >> ~/.bashrc | ||
echo "fi" >> ~/.bashrc | ||
source ~/.bashrc | ||
} | ||
|
||
function run_nuc_data_make { | ||
|
||
cd | ||
# Generate nuclear data file | ||
nuc_data_make | ||
|
||
} | ||
|
||
function test_pyne { | ||
|
||
cd $install_dir/pyne | ||
cd tests | ||
|
||
./travis-run-tests.sh python3 | ||
} | ||
|
||
set -euo pipefail | ||
IFS=$'\n\t' | ||
|
||
# system update | ||
eval brew update | ||
eval brew install ${brew_package_list} | ||
export PATH="${HOME}/.local/bin:${PATH}" | ||
eval sudo pip3 install ${pip_package_list} | ||
|
||
install_dir=${HOME}/opt | ||
mkdir -p ${install_dir} | ||
|
||
build_moab | ||
|
||
nsryan2 marked this conversation as resolved.
Show resolved
Hide resolved
nsryan2 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
build_dagmc | ||
|
||
install_pyne $1 | ||
|
||
run_nuc_data_make | ||
|
||
test_pyne | ||
|
||
echo "Run 'source ~/.bashrc' to update environment variables. PyNE may not function correctly without doing so." | ||
echo "PyNE build complete." |
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,22 @@ | ||
#!/bin/bash | ||
# This script builds the repo version of PyNE (with the MOAB optional | ||
# dependency) from scratch on MacOS 10.15.6. The folder $HOME/opt is created | ||
# and PyNE is installed within. | ||
# | ||
# Run this script from any directory by issuing the command where <version> | ||
# is either "dev" or "stable": | ||
# $ ./osx_10.15.6.sh <version> | ||
# After the build finishes run: | ||
# $ source ~/.bashrc | ||
# or open a new terminal. | ||
|
||
# Use package manager for as many packages as possible | ||
brew_package_list="glib python3 wget eigen \ | ||
git cmake vim emacs gcc openblas \ | ||
lapack autoconf libtool make hdf5" | ||
|
||
pip_package_list="future numpy scipy cython nose tables matplotlib jinja2 \ | ||
setuptools h5py" | ||
|
||
|
||
source macosx.sh $1 |
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Difference from Ubuntu: why not update the ENV Variables directly here (instead of sourcing .bashrc below)?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we should update the linux version accordingly:
I see 2 advantages: