Skip to content

Commit e467f4b

Browse files
committed
submodule fix
1 parent 85e7840 commit e467f4b

File tree

1 file changed

+19
-8
lines changed

1 file changed

+19
-8
lines changed

.github/workflows/ci.yml

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ jobs:
5959
run: |
6060
sudo apt-get update
6161
sudo apt-get install -y libmpfr-dev libssl-dev libfftw3-dev
62+
6263
- name: Install SLEEF
6364
run: |
6465
sudo apt-get update -y
@@ -68,17 +69,27 @@ jobs:
6869
cmake -S . -B build -DSLEEF_BUILD_QUAD:BOOL=ON -DSLEEF_BUILD_SHARED_LIBS:BOOL=ON -DCMAKE_POSITION_INDEPENDENT_CODE=ON
6970
cmake --build build/ --clean-first -j
7071
sudo cmake --install build --prefix /usr/local
72+
7173
- name: Install quaddtype
7274
working-directory: quaddtype
7375
run: |
74-
CFLAGS="-I/usr/local/include -I{project}/numpy_quaddtype/QBLAS/include $CFLAGS"
75-
CXXFLAGS="-I/usr/local/include -I{project}/numpy_quaddtype/QBLAS/include -fext-numeric-literals $CXXFLAGS"
76-
LDFLAGS="-L/usr/local/lib64 -L/usr/local/lib -Wl,-rpath,/usr/local/lib64 -Wl,-rpath,/usr/local/lib -fopenmp $LDFLAGS"
77-
LD_LIBRARY_PATH="/usr/local/lib64:/usr/local/lib:$LD_LIBRARY_PATH"
78-
79-
git submodule update --init --recursive
80-
ls -la numpy_quaddtype/QBLAS/
81-
python -m pip install . -v --no-build-isolation -Cbuilddir=build -C'compile-args=-v' -Csetup-args="-Dbuildtype=debug"
76+
# Initialize submodules first
77+
git submodule update --init --recursive
78+
ls -la numpy_quaddtype/QBLAS/
79+
80+
# Set environment variables with proper export and correct paths
81+
export CFLAGS="-I/usr/local/include -I$(pwd)/numpy_quaddtype/QBLAS/include"
82+
export CXXFLAGS="-I/usr/local/include -I$(pwd)/numpy_quaddtype/QBLAS/include -fext-numeric-literals"
83+
export LDFLAGS="-L/usr/local/lib64 -L/usr/local/lib -Wl,-rpath,/usr/local/lib64 -Wl,-rpath,/usr/local/lib -fopenmp"
84+
export LD_LIBRARY_PATH="/usr/local/lib64:/usr/local/lib:$LD_LIBRARY_PATH"
85+
86+
# Install with meson args to ensure the C++ flags are passed through
87+
python -m pip install . -v --no-build-isolation \
88+
-Cbuilddir=build \
89+
-C'compile-args=-v' \
90+
-Csetup-args="-Dbuildtype=debug" \
91+
-Csetup-args="-Dcpp_args=-fext-numeric-literals"
92+
8293
- name: Run quaddtype tests
8394
working-directory: quaddtype
8495
run: |

0 commit comments

Comments
 (0)