Commit 1944102c authored by Remi Perenon's avatar Remi Perenon

Debugging CI and build scripts to compel with Fortran HDF5

parent 0ce89449
......@@ -45,7 +45,7 @@ make:linux_ifort:
script:
- docker build --force-rm -t ci_crysfml_xenial_ifort -f ${CI_PROJECT_DIR}/BuildServer/Docker/Dockerfile_setup_xenial_ifort .
- docker build --force-rm --no-cache -t ci_crysfml_xenial_ifort_build -f ${CI_PROJECT_DIR}/BuildServer/Docker/Dockerfile_build_xenial_ifort .
- docker run -iv${PWD}:/artifacts/ -v/users/ci/intel:/opt/intel ci_crysfml_xenial_ifort_build
- docker run -i -v${PWD}:/artifacts/ -v/users/ci/projects/fullprof/intel:/opt/intel -v/users/ci/projects/fullprof/hdf5-1_12_0:/hdf5 ci_crysfml_xenial_ifort_build
artifacts:
paths:
- ${CI_PROJECT_DIR}/build_ifort
......@@ -60,6 +60,7 @@ make:linux_ifort:
make:macos_gfortran:
stage: make
script:
- export HDF5_INCLUDE_PATH="/Users/ci/Projects/fullprof/hdf5-gfortran/include"
- BuildServer/Unix/build.sh gfortran
artifacts:
paths:
......@@ -71,12 +72,13 @@ make:macos_gfortran:
make:macos_ifort:
stage: make
script:
- export HDF5_INCLUDE_PATH="/Users/ci/Projects/fullprof/hdf5-ifort/include"
- BuildServer/Unix/build.sh ifort
artifacts:
paths:
- ${CI_PROJECT_DIR}/build_ifort
expire_in: 1 day
script:
- BuildServer/Unix/build.sh ifort
tags:
- sci
- osx-10.13
......@@ -87,10 +89,7 @@ make:windows_gfortran:
stage: make
script:
- set PATH=%PATH:C:\Program Files\Git\bin;=%
- set CRYSFML_HDF5_DIR=C:\\Projects\\fullprof\\hdf5
- set CRYSFML_BOOST_DIR=C:\\Projects\\fullprof\\boost
- set CRYSFML_NEXUS_DIR=C:\\Projects\\fullprof\\NeXuS
- set CRYSFML_BLOSC_DIR=C:\\Projects\\fullprof\\blosc
- set HDF5_INCLUDE_PATH=C:\\Projects\\fullprof\\hdf5-gfortran\\include
- call "%BuildServer\\Windows\\build.bat" gfortran
artifacts:
paths:
......@@ -105,10 +104,7 @@ make:windows_ifort:
script:
- call "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\VC\\Auxiliary\\Build\\vcvars64.bat"
- set LIB="C:\\Program Files (x86)\\IntelSWTools\\compilers_and_libraries_2019.3.203\\windows\\compiler\\lib\\intel64_win";%LIB%
- set CRYSFML_HDF5_DIR=C:\\Projects\\fullprof\\hdf5
- set CRYSFML_BOOST_DIR=C:\\Projects\\fullprof\\boost
- set CRYSFML_NEXUS_DIR=C:\\Projects\\fullprof\\NeXuS
- set CRYSFML_BLOSC_DIR=C:\\Projects\\fullprof\\blosc
- set HDF5_INCLUDE_PATH=C:\\Projects\\fullprof\\hdf5-ifort\\include\\shared
- call "%BuildServer\\Windows\\build.bat" ifort
artifacts:
paths:
......
FROM ci_crysfml_xenial_ifort
SHELL ["/bin/bash", "-c"]
ARG CI_COMMIT_SHORT_SHA
ARG CI_COMMIT_REF_NAME
ENV CI_COMMIT_SHORT_SHA=${CI_COMMIT_SHORT_SHA}
ENV CI_COMMIT_REF_NAME=${CI_COMMIT_REF_NAME}
ENV HDF5_INCLUDE_PATH=/hdf5/include
COPY ./ /app/
WORKDIR /app
......
......@@ -3,18 +3,7 @@ FROM ubuntu:xenial
ENV https_proxy http://proxy.ill.fr:8888
ENV http_proxy http://proxy.ill.fr:8888
RUN apt-get update
RUN apt-get install -y cmake
RUN apt-get install -y g++
RUN apt-get install -y gfortran
RUN apt-get install -y git
RUN apt-get install -y libhdf5-dev
RUN apt-get install -y libboost-all-dev
RUN git clone https://github.com/nexusformat/code.git
RUN mkdir code/build; cd code/build; cmake ..; cmake --build .; make install
RUN rm -rf code
RUN git clone https://github.com/blosc/c-blosc.git
RUN mkdir c-blosc/build; cd c-blosc/build; cmake ..; cmake --build .; make install
RUN rm -rf c-blosc
\ No newline at end of file
RUN apt-get update && apt-get install -y \
cmake \
gfortran \
libhdf5-dev
\ No newline at end of file
......@@ -3,19 +3,7 @@ FROM ubuntu:xenial
ENV https_proxy http://proxy.ill.fr:8888
ENV http_proxy http://proxy.ill.fr:8888
RUN apt-get update
RUN apt-get install -y cmake
RUN apt-get install -y g++
RUN apt-get install -y git
RUN apt-get install -y libhdf5-dev
RUN apt-get install -y libboost-all-dev
RUN git clone https://github.com/nexusformat/code.git
RUN mkdir code/build; cd code/build; cmake ..; cmake --build .; make install
RUN rm -rf code
RUN git clone https://github.com/blosc/c-blosc.git
RUN mkdir c-blosc/build; cd c-blosc/build; cmake ..; cmake --build .; make install
RUN rm -rf c-blosc
RUN apt-get update && apt-get install -y \
cmake
ENV PATH=/opt/intel/bin:$PATH
\ No newline at end of file
......@@ -5,5 +5,5 @@ rm -Rf build_${compiler##/*}
mkdir build_${compiler##/*}
cd build_${compiler##/*}
cmake -D USE_HDF=ON -D CMAKE_Fortran_COMPILER=${compiler} ..
cmake -D USE_HDF=ON -D CMAKE_Fortran_COMPILER=${compiler} -D HDF5_INCLUDE_PATH=${HDF5_INCLUDE_PATH} ..
cmake --build .
\ No newline at end of file
......@@ -6,11 +6,9 @@ mkdir build_%compiler%
cd build_%compiler%
if %compiler% neq gfortran (
cmake -G "NMake Makefiles" -D USE_HDF=ON -D CMAKE_Fortran_COMPILER=%compiler% ..
cmake -G "NMake Makefiles" -D USE_HDF=ON -D CMAKE_Fortran_COMPILER=%compiler% -D HDF5_INCLUDE_PATH=%HDF5_INCLUDE_PATH% ..
) else (
rem C++ and C compiles must be set. Also, a "trick" has been set on the build server to build with MinGW
rem See See http://hdf-forum.184993.n3.nabble.com/HDF5-and-MinGW-td3393676.html for more details about this "trick"
cmake -G "MinGW Makefiles" -D USE_HDF=ON -D CMAKE_Fortran_COMPILER=%compiler% -D CMAKE_CXX_COMPILER=g++.exe -D CMAKE_C_COMPILER=gcc.exe -D MINGW_HDF_TRICK=1 ..
cmake -G "MinGW Makefiles" -D USE_HDF=ON -D CMAKE_Fortran_COMPILER=%compiler% -D HDF5_INCLUDE_PATH=%HDF5_INCLUDE_PATH% ..
)
cmake --build .
\ No newline at end of file
Markdown is supported
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