Commit c02abce3 authored by Michael Goette's avatar Michael Goette

added specific config file for python build ci since testcoverage conflicts python build

parent 075085be
......@@ -3,10 +3,6 @@
#=================================================================================================
CXX = g++
COMPATIBILITY = -std=c++11
PYTHON2_CONFIG = `python2-config --cflags --ldflags`
PYTHON3_CONFIG = `python3-config --cflags --ldflags`
PYTEST2 = pytest2
PYTEST3 = pytest
STRICT_WARNINGS = TRUE
DEBUG += -D XERUS_TEST_COVERAGE # Enable coverage tests
......@@ -23,6 +19,4 @@ BOOST_LIBS = -lboost_filesystem
OTHER += -I /usr/include/python2.7/ -lboost_python -I/usr/lib64/python2.7/site-packages/numpy/core/include/ -lpython2.7 -fno-var-tracking-assignments
BOOST_PYTHON2 = -lboost_python-py27
BOOST_PYTHON3 = -lboost_python-py35
#=================================================================================================
# Compiler Options
#=================================================================================================
CXX = g++
COMPATIBILITY = -std=c++11
PYTHON2_CONFIG = `python2-config --cflags --ldflags`
PYTHON3_CONFIG = `python3-config --cflags --ldflags`
PYTEST2 = pytest2
PYTEST3 = pytest
STRICT_WARNINGS = TRUE
# DEBUG += -D XERUS_TEST_COVERAGE # Enable coverage tests
DEBUG += -g # Adds debug symbols
#=================================================================================================
# External libraries
#=================================================================================================
BLAS_LIBRARIES = -lopenblas -lgfortran # Openblas, serial
LAPACK_LIBRARIES = -llapacke -llapack # Standard Lapack + Lapacke libraries
SUITESPARSE = -lcholmod -lspqr
BOOST_LIBS = -lboost_filesystem
OTHER += -I /usr/include/python2.7/ -lboost_python -I/usr/lib64/python2.7/site-packages/numpy/core/include/ -lpython2.7 -fno-var-tracking-assignments
BOOST_PYTHON2 = -lboost_python-py27
BOOST_PYTHON3 = -lboost_python-py35
......@@ -20,6 +20,7 @@
!*.rb
!*.py
!.config.mk.*
!*.md
!*.xml
......
......@@ -38,17 +38,17 @@ job_test_gcc_nocheck:
job_build_python2:
stage: build_python2
script: "g++ --version; cp .config.mk.ci.gcc config.mk; make python2"
script: "g++ --version; cp .config.mk.ci.gcc.python config.mk; make python2"
when: always
job_build_python3:
stage: build_python3
script: "g++ --version; cp .config.mk.ci.gcc config.mk; make python3"
script: "g++ --version; cp .config.mk.ci.gcc.python config.mk; make python3"
when: always
job_test_python3:
stage: test_python3
script: "g++ --version; cp .config.mk.ci.gcc config.mk; make test_python3"
script: "g++ --version; cp .config.mk.ci.gcc.python config.mk; make test_python3"
when: always
......
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