Skip to content
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.

Sign up for GitHub

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

Clean up bin dir #76

Merged
merged 5 commits into from
Aug 9, 2016
Merged

Clean up bin dir #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
144c94d
move fix_load_path_mac.py to bin directory
logicabrity Aug 9, 2016
cd1b3b5
remove installation script for sundials 2.5 we're using the 2.6 one now
logicabrity Aug 9, 2016
cbefdb9
write a little module docstring for fix_load_path
logicabrity Aug 9, 2016
8e3b515
single apt-get command in install-ubuntu-packages
logicabrity Aug 9, 2016
5ef6d96
outsource installation with pip to own script
logicabrity Aug 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion fix_load_path_mac.py → bin/fix_load_path_mac.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
"""
Creates working dylibs on Mac OS X by adding the full path to referenced libraries.
This fixes ImportErrors that may appear starting with SUNDIALS 2.6.

"""
import os
import glob
import re
Expand Down Expand Up @@ -27,4 +32,4 @@ def extract_library(so_file):

for so in sos:
extract_library(so)
print("Done for %s!"%so)
print("Done for %s!"%so)
1 change: 1 addition & 0 deletions bin/install-python-packages.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
pip install --upgrade cython psutil ipywidgets
46 changes: 0 additions & 46 deletions bin/install-sundials-2.5.sh
View file
Open in desktop

This file was deleted.

9 changes: 6 additions & 3 deletions bin/install-ubuntu-packages.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
# required to compile fidimag
apt-get install python-pip python-numpy python-dev python-scipy cmake
# required for tests and running it
apt-get install python-pytest python-pyvtk ipython python-matplotlib
deps_compilation="python-pip python-numpy python-dev python-scipy cmake"

# required for tests and running fidimag
deps_live="python-pytest python-pyvtk ipython python-matplotlib"

apt-get install $deps_compilation $deps_live
6 changes: 2 additions & 4 deletions bin/ubuntu_install_script.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
echo "Super user authentication required to add packages (you will be \
prompted for confirmation)."
sudo bash install-ubuntu-packages.sh
sudo bash install-python-packages.sh
bash install-fftw.sh
bash install-sundials.sh
sudo pip install cython --upgrade
sudo pip install psutil ipywidgets
pushd .. > /dev/null
make

# Adds Fidimag environment variables to profile.d, if they're not already
# there.
# Adds fidimag environment variables to profile.d, if they're not already there.
FIDIMAG_PROFILE_PATH=/etc/profile.d/fidimag.sh
if [ ! -e "$FIDIMAG_PROFILE_PATH" ]; then
echo "Warning: Adding Fidimag to path at $FIDIMAG_PROFILE_PATH."
Expand Down
2 changes: 1 addition & 1 deletion doc/install.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ which can be seen by using ``otool -L fidimag/extensions/clib.so``, ::
/usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 1213.0.0)
/opt/local/lib/libgcc/libgcc_s.1.dylib (compatibility version 1.0.0, current version 1.0.0)

A solution is to change these path manually with ``install_name_tool``, so we have provided a python script (``fix_load_path_mac.py``) to do this.
A solution is to change these path manually with ``install_name_tool``, so we have provided a python script (``bin/fix_load_path_mac.py``) to do this.
After run the script, the library path is fixed, for example, the output of the cmd ``otool -L fidimag/extensions/clib.so`` gives ::

fidimag/extensions/neb_clib.so:
Expand Down