Skip to content
GitLab
Commit 2340540b authored by LAMBERT Jean-charles's avatar LAMBERT Jean-charles
Browse files

CI fix

parents 628161b3 6aca9e2f
Hide whitespace changes
Inline Side-by-side
.gitlab-ci.yml
View file @ 2340540b
......@@ -35,6 +35,7 @@ variables :
OSX : 0
TESTPYPIOSX : 0
PYPIOSX : 0
BUILDALL : 0
before_script:
# Load NEMO
......@@ -51,10 +52,11 @@ before_script:
#
manylinux2010 :
stage : build
image : registry.lam.fr/infrastructure/unsio/unsio-manylinux2010
image : registry.lam.fr/infrastructure/unsio/unsio-manylinux2010:20220620
only :
variables:
- $WHEEL == "1"
- $BUILDALL == "1"
script:
# build
- CI/script/build.sh cmake3
......@@ -77,7 +79,7 @@ manylinux2010 :
# Push wheel to testpypi repos
push-testpypi-manylinux2010:
stage: testpypi
image : registry.lam.fr/infrastructure/unsio/unsio-manylinux2010
image : registry.lam.fr/infrastructure/unsio/unsio-manylinux2010:20220620
only :
variables:
- $TESTPYPI == "1"
......@@ -91,7 +93,7 @@ push-testpypi-manylinux2010:
# Push wheel to pypi repos
push-pypi-manylinux2010:
stage: pypi
image : registry.lam.fr/infrastructure/unsio/unsio-manylinux2010
image : registry.lam.fr/infrastructure/unsio/unsio-manylinux2010:20220620
only :
variables:
- $PYPI == "1"
......@@ -106,10 +108,11 @@ push-pypi-manylinux2010:
#
manylinux1 :
stage : build
image : registry.lam.fr/infrastructure/unsio/unsio-manylinux1
image : registry.lam.fr/infrastructure/unsio/unsio-manylinux1:latest
only :
variables:
- $WHEEL == "1"
- $BUILDALL == "1"
script:
# build
- CI/script/build.sh cmake
......@@ -131,7 +134,7 @@ manylinux1 :
# Push wheel to testpypi repos
push-testpypi-manylinux1:
stage: testpypi
image : registry.lam.fr/infrastructure/unsio/unsio-manylinux1
image : registry.lam.fr/infrastructure/unsio/unsio-manylinux1:latest
only :
variables:
- $TESTPYPI == "1"
......@@ -145,7 +148,7 @@ push-testpypi-manylinux1:
# Push wheel to pypi repos
push-pypi-manylinux1:
stage: pypi
image : registry.lam.fr/infrastructure/unsio/unsio-manylinux1
image : registry.lam.fr/infrastructure/unsio/unsio-manylinux1:latest
only :
variables:
- $PYPI == "1"
......@@ -166,6 +169,7 @@ OSX:
only :
variables:
- $OSX == "1"
- $BUILDALL == "1"
script:
# build
- CI/scriptOSX/build.sh
......
CI/scriptOSX/build.sh
View file @ 2340540b
......@@ -10,14 +10,18 @@ cd unsio
# swicth to develop branch !!!
# git checkout develop
$mycmake . -DCMAKE_INSTALL_PREFIX=/tmp/local/unsio -DNO_RPATH=1
# remove previous build
rm -rf /tmp/local/unsio
# compile and install unsio
$mycmake . -DCMAKE_INSTALL_PREFIX=/tmp/local/unsio
make -j 4 && make install
# Activate nemo environment
source /Users/grunner/works/GIT/nemo/nemo_start.sh
# build uns_projects
cd ..
rm -rf /tmp/local/unsio
$mycmake . -DCMAKE_INSTALL_PREFIX=/tmp/local/unsio -DUNSIOPATH=/tmp/local/unsio -DNO_RPATH=1 -DCMAKE_BUILD_TYPE=Release
$mycmake . -DCMAKE_INSTALL_PREFIX=/tmp/local/unsio -DUNSIOPATH=/tmp/local/unsio -DCMAKE_BUILD_TYPE=Release
make -j 4
make install
CI/scriptOSX/repair-wheel.sh
View file @ 2340540b
......@@ -10,7 +10,7 @@ conda activate py38
# Bundle external shared libraries into the wheels
for whl in wheelhouse/*unsio*.whl; do
echo "repairing $whl...."
delocate-wheel "$whl" -w ./wheel
DYLD_LIBRARY_PATH=/tmp/local/unsio/lib delocate-wheel "$whl" -w ./wheel
done
# de-activate
......
CMakeLists.txt
View file @ 2340540b
......@@ -70,7 +70,7 @@ FIND_PACKAGE(RPCH REQUIRED)
FIND_PACKAGE(BOOST)
#FIND_PACKAGE(NEMO REQUIRED)
MESSAGE( STATUS "NEMOLIB : " ${NEMOLIB} )
MESSAGE( STATUS "NEMOLIB : " $ENV{NEMO}/lib )
# contains the full path to the top level directory of your build tree
MESSAGE( STATUS "PROJECT_BINARY_DIR: " ${PROJECT_BINARY_DIR} )
......@@ -80,7 +80,7 @@ MESSAGE( STATUS "PROJECT_BINARY_DIR: " ${PROJECT_BINARY_DIR} )
MESSAGE( STATUS "PROJECT_SOURCE_DIR: " ${PROJECT_SOURCE_DIR} )
# Make sure the linker can find the Hello library once it is built.
link_directories ( ${UNSIOPATH}/${LIB_SUFFIX} $ENV{NEMOLIB} /opt/local/lib ${UNSIOPATH}/lib ${UNSIOPATH}/lib64 ${DEHNEN}/falcON/lib ${DEHNEN}/utils/lib $ENV{PGPLOT_DIR} ${G2C_DIR} ${PROJECT_BINARY_DIR}/lib /usr/lib64 /usr/X11/lib ${FC_GFORT_PATH} ${FC_G77_PATH} ${EXTRA_LINK_DIRS})
link_directories ( ${UNSIOPATH}/${LIB_SUFFIX} $ENV{NEMOLIB} /opt/local/lib ${UNSIOPATH}/lib ${UNSIOPATH}/lib64 ${DEHNEN}/falcON/lib ${DEHNEN}/utils/lib $ENV{PGPLOT_DIR} ${G2C_DIR} ${PROJECT_BINARY_DIR}/lib /usr/lib64 /usr/X11/lib ${RPC_LIB_PATH} ${FC_GFORT_PATH} ${FC_G77_PATH} ${EXTRA_LINK_DIRS})
# Find all the sources for the utils LIB
if ( NEMO_INSTALLED )
......@@ -104,18 +104,19 @@ endif ()
add_library (JCLprojects SHARED ${LIBPROJECTS})
if(OSX)
target_link_libraries(JCLprojects nemo unsio cpgplot pgplot gfortran quadmath WDutils falcON ${RPC}) # WDutils falcON gomp c++)
target_link_libraries(JCLprojects nemo unsio cpgplot pgplot gfortran quadmath WDutils falcON ${RPC_NAME_LIB}) # WDutils falcON gomp c++)
set_target_properties(JCLprojects PROPERTIES LINK_FLAGS "-undefined suppress -flat_namespace")
endif(OSX)
if (APPLE)
if (NOT NO_RPATH)
MESSAGE(STATUS "RPATH activated for UNSIO library")
SET_TARGET_PROPERTIES(unsio PROPERTIES MACOSX_RPATH TRUE)
MESSAGE(STATUS "RPATH activated for JCLprojects/JCLutils library")
SET_TARGET_PROPERTIES(JCLprojects PROPERTIES MACOSX_RPATH TRUE)
SET_TARGET_PROPERTIES(JCLutils PROPERTIES MACOSX_RPATH TRUE)
else ()
# to deactivate RPATH compile with -DNO_RPATH=1
# it's mandatory to build wheel on MacOSX
MESSAGE(STATUS "RPATH DE-activated for UNSIO library")
MESSAGE(STATUS "RPATH not-activated for JCLprojects/JCLutils library")
endif()
endif (APPLE)
......
cmake/FindUNSIO.cmake
View file @ 2340540b
......@@ -24,7 +24,7 @@ if (NOT UNSIO_SETUP)
if ( UNSIOPATH ) # user configure cmake with variable -DUNSIO_INSTALLPATH="/unsio/path"
find_library(UNSIOLIB NAMES unsio PATHS ${UNSIOPATH}/lib ${UNSIOPATH}/lib64)
find_library(UNSIOLIB NAMES unsio PATHS ${UNSIOPATH}/lib ${UNSIOPATH}/lib64 NO_DEFAULT_PATH)
MESSAGE (STATUS "UNSIOLIB = " ${UNSIOLIB})
if (NOT ${UNSIOLIB} STREQUAL UNSIOLIB-NOTFOUND)
MESSAGE(STATUS "Found UNSIOLIB =" ${UNSIOLIB})
......@@ -35,7 +35,7 @@ if (NOT UNSIO_SETUP)
if (NOT UNSIO_FOUND) # try system
MESSAGE (STATUS "Trying UNSIOLIB = " ${UNSIOLIB} " from system=/usr/${LIB_SUFFIX}" )
find_library(UNSIOLIB NAMES unsio PATHS /usr/${LIB_SUFFIX})
find_library(UNSIOLIB NAMES unsio PATHS /usr/${LIB_SUFFIX} NO_DEFAULT_PATH)
if ( NOT ${UNSIOLIB} STREQUAL UNSIOLIB-NOTFOUND)
MESSAGE(STATUS "Found UNSIOLIB in system =" ${UNSIOLIB})
SET(UNSIO_FOUND TRUE)
......@@ -47,7 +47,7 @@ if (NOT UNSIO_SETUP)
endif()
if (NOT UNSIO_FOUND) # try $HOME/local
find_library(UNSIOLIB NAMES unsio PATHS $ENV{HOME}/local/unsio/${LIB_SUFFIX})
find_library(UNSIOLIB NAMES unsio PATHS $ENV{HOME}/local/unsio/${LIB_SUFFIX} NO_DEFAULT_PATH)
MESSAGE (STATUS "UNSIOLIB = " ${UNSIOLIB} " -- " $ENV{HOME})
if (NOT ${UNSIOLIB} STREQUAL UNSIOLIB-NOTFOUND)
MESSAGE(STATUS "Found UNSIOLIB in $ENV{HOME}/local/unsio/ =" ${UNSIOLIB})
......@@ -63,4 +63,5 @@ if (NOT UNSIO_SETUP)
typed_cache_set ( STRING "UNSIOPATH location" UNSIOPATH ${UNSIOPATH} )
endif()
message(STATUS "UNSIOPATH = " ${UNSIOPATH})
endif () #NOT UNSIO_SETUP
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment