Skip to content

Commit f643be1

Browse files
No gfortran is needed
1 parent 505cabe commit f643be1

File tree

3 files changed

+2
-50
lines changed

3 files changed

+2
-50
lines changed

.github/workflows/build_wheels.yml

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -122,54 +122,6 @@ jobs:
122122
OPENMP_URL="https://anaconda.org/conda-forge/llvm-openmp/11.1.0/download/osx-arm64/llvm-openmp-11.1.0-hf3c4609_1.tar.bz2"
123123
fi
124124
125-
# Download gfortran with proper macOS minimum version (11.0)
126-
if [[ $(uname -m) == "x86_64" ]]; then
127-
GFORTRAN_URL="https://github.com/isuruf/gcc/releases/download/gcc-11.3.0-2/gfortran-darwin-x86_64-native.tar.gz"
128-
KNOWN_SHA256="981367dd0ad4335613e91bbee453d60b6669f5d7e976d18c7bdb7f1966f26ae4 gfortran.tar.gz"
129-
elif [[ $(uname -m) == "arm64" ]]; then
130-
GFORTRAN_URL="https://github.com/isuruf/gcc/releases/download/gcc-11.3.0-2/gfortran-darwin-arm64-native.tar.gz"
131-
KNOWN_SHA256="84364eee32ba843d883fb8124867e2bf61a0cd73b6416d9897ceff7b85a24604 gfortran.tar.gz"
132-
fi
133-
134-
# Validate gfortran tarball
135-
curl -L $GFORTRAN_URL -o gfortran.tar.gz
136-
if ! echo "$KNOWN_SHA256" != "$(shasum --algorithm 256 gfortran.tar.gz)"; then
137-
echo "Checksum failed"
138-
exit 1
139-
fi
140-
141-
mkdir -p gfortran_installed
142-
tar -xv -C gfortran_installed/ -f gfortran.tar.gz
143-
144-
if [[ $(uname -m) == "x86_64" ]]; then
145-
export FC=$(pwd)/gfortran_installed/gfortran-darwin-x86_64-native/bin/gfortran
146-
export PATH=$(pwd)/gfortran_installed/gfortran-darwin-x86_64-native/bin:$PATH
147-
elif [[ $(uname -m) == "arm64" ]]; then
148-
export FC=$(pwd)/gfortran_installed/gfortran-darwin-arm64-native/bin/gfortran
149-
export PATH=$(pwd)/gfortran_installed/gfortran-darwin-arm64-native/bin:$PATH
150-
fi
151-
152-
# link libgfortran dylibs and place them in $SOLVER_LIB_PATH
153-
# and then change rpath for each of them
154-
# Note: libgcc_s.1.dylib not available on macOS arm64; skip for now
155-
SOLVER_LIB_PATH=$(pwd)/.idaklu/lib
156-
mkdir -p $SOLVER_LIB_PATH
157-
if [[ $(uname -m) == "x86_64" ]]; then
158-
lib_dir=$(pwd)/gfortran_installed/gfortran-darwin-x86_64-native/lib
159-
for lib in libgfortran.5.dylib libgfortran.dylib libquadmath.0.dylib libquadmath.dylib libgcc_s.1.dylib libgcc_s.1.1.dylib; do
160-
cp $lib_dir/$lib $SOLVER_LIB_PATH/
161-
install_name_tool -id $SOLVER_LIB_PATH/$lib $SOLVER_LIB_PATH/$lib
162-
codesign --force --sign - $SOLVER_LIB_PATH/$lib
163-
done
164-
elif [[ $(uname -m) == "arm64" ]]; then
165-
lib_dir=$(pwd)/gfortran_installed/gfortran-darwin-arm64-native/lib
166-
for lib in libgfortran.5.dylib libgfortran.dylib libquadmath.0.dylib libquadmath.dylib libgcc_s.1.1.dylib; do
167-
cp $lib_dir/$lib $SOLVER_LIB_PATH/.
168-
install_name_tool -id $SOLVER_LIB_PATH/$lib $SOLVER_LIB_PATH/$lib
169-
codesign --force --sign - $SOLVER_LIB_PATH/$lib
170-
done
171-
fi
172-
173125
export SDKROOT=${SDKROOT:-$(xcrun --show-sdk-path)}
174126
175127
# Can't download LLVM-OpenMP directly, use conda and set environment variables

.github/workflows/unit_tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- name: Install dependencies (Linux)
3232
if: matrix.os == 'ubuntu-latest'
3333
run: |
34-
sudo apt-get install gfortran gcc libopenblas-dev
34+
sudo apt-get install gcc libopenblas-dev
3535
pip install nox
3636
3737
- name: Install dependencies (MacOs)

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ pip install .
4242
Linux installs may vary based on the distribution, however, the basic build can
4343
be performed with the following commands:
4444
```bash
45-
sudo apt-get install libopenblas-dev gcc gfortran make g++ build-essential
45+
sudo apt-get install libopenblas-dev gcc make g++ build-essential
4646
pip install cmake casadi setuptools wheel
4747
git submodules update --init --recurisive
4848
python install_KLU_Sundials.py

0 commit comments

Comments
 (0)