Skip to content

Commit

Permalink
Revert "[CSDP] Build without openmp on windows (#950)"
Browse files Browse the repository at this point in the history
This reverts commit 01c194b.
  • Loading branch information
ViralBShah committed Apr 30, 2020
1 parent 01c194b commit 96ce50d
Showing 1 changed file with 2 additions and 9 deletions.
11 changes: 2 additions & 9 deletions C/Coin-OR/CSDP/build_tarballs.jl
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,7 @@ cd $WORKSPACE/srcdir/Csdp*
atomic_patch -p1 ${WORKSPACE}/srcdir/patches/blegat.patch
CFLAGS="-O2 -fPIC -ansi -Wall -DUSEGETTIME -I../include"
if [[ "${target}" != *mingw* ]]; then
CFLAGS+=" -fopenmp -DUSEOPENMP -DSETNUMTHREADS"
fi
CFLAGS="-O2 -fPIC -fopenmp -ansi -Wall -DUSEOPENMP -DSETNUMTHREADS -DUSEGETTIME -I../include"
LIBS="-L../lib -lsdp -lopenblas -lm"
if [[ "${nbits}" == 64 ]] && [[ "${target}" != *aarch64* ]]; then
Expand All @@ -43,11 +40,7 @@ if [[ "${target}" == *-apple-* ]]; then
fi
mkdir -p ${libdir}
if [[ "${target}" != *mingw* ]]; then
${CC} -fopenmp -fPIC -shared -Wl,${all_load} libsdp.a -Wl,${noall_load} -o ${libdir}/libcsdp.${dlext} -lgomp -lopenblas -lm
else
${CC} -fPIC -shared -Wl,${all_load} libsdp.a -Wl,${noall_load} -o ${libdir}/libcsdp.${dlext} -lopenblas -lm
fi
${CC} -fopenmp -fPIC -shared -Wl,${all_load} libsdp.a -Wl,${noall_load} -o ${libdir}/libcsdp.${dlext} -lgomp -lopenblas -lm
"""

# These are the platforms we will build for by default, unless further
Expand Down

3 comments on commit 96ce50d

@giordano
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ViralBShah registration failed on this commit, should I retrigger it?

@ViralBShah
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. Thank you!

@giordano
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done!

Please sign in to comment.