Commit c1264c24 authored by Daniel Simon's avatar Daniel Simon
Browse files

Conflict in merging develop and arithmetics solved.

parents f02c2068 623f634e

.gitignore

+5 −1
Original line number Diff line number Diff line 
.settings

/nbproject

/Debug

/Release
@@ -6,3 +5,8 @@ 
/CMakeLists.txt.user

/doc/_build

/Build



# Eclipse project stuff

/.settings

/.project

/.pydevproject

.gitlab-ci.yml

0 → 100644
+119 −0
Original line number Diff line number Diff line 
# vim: tabstop=4 shiftwidth=4 softtabstop=4



before_script:

    - which g++

    - which cmake



# Stages are useful only to enforce some ordering of the jobs. Every job is run

# in its own directory and only very few data can be shared between the jobs in

# different stages. It has to be zipped and uploaded to the server, so we can't

# do it with the build directory. Hence, we must build, test and install in the

# same job.

stages:

    - build



# default flags for cmake

.default_cmake_flags_def: &default_cmake_flags

    WITH_OPENMP: "no"

    WITH_CUDA: "no"

    WITH_CUDA_ARCH: "auto"

    WITH_MIC: "no"

    WITH_TESTS: "yes"

    WITH_COVERAGE: "no"

    WITH_EXAMPLES: "yes"



# template for build jobs

.build_template_def: &build_template

    stage: build

    script:

        - export NUM_CORES=$(grep "core id" /proc/cpuinfo | wc -l)

        - export MAKEFLAGS="-l$(echo 1.5*$NUM_CORES | bc) -j$NUM_CORES"

        - mkdir -p "./builddir/$CI_JOB_NAME"

        - pushd "./builddir/$CI_JOB_NAME"

        - cmake ../..

                -DCMAKE_BUILD_TYPE=${BUILD_TYPE}

                -DCMAKE_INSTALL_PREFIX=$(pwd)/${BUILD_TYPE}_install_prefix

                -DWITH_OPENMP=${WITH_OPENMP}

                -DWITH_CUDA=${WITH_CUDA}

                -DWITH_CUDA_ARCH=${WITH_CUDA_ARCH}

                -DWITH_MIC=${WITH_MIC}

                -DWITH_TESTS=${WITH_TESTS}

                -DWITH_COVERAGE=${WITH_COVERAGE}

                -DWITH_EXAMPLES=${WITH_EXAMPLES}

        - make

        - make test

        - make install

        - popd

    variables:

        <<: *default_cmake_flags

        BUILD_TYPE: Debug



# Cuda builds are specified first because they take more time than host-only builds,

# which can be allocated on hosts whitout GPUs.



cuda_Debug:

    <<: *build_template

    tags:

        - gpu

    variables:

        <<: *default_cmake_flags

        WITH_CUDA: "yes"

        BUILD_TYPE: Debug



cuda_Release:

    <<: *build_template

    tags:

        - gpu

    variables:

        <<: *default_cmake_flags

        WITH_CUDA: "yes"

        BUILD_TYPE: Release



cuda+openmp_Debug:

    <<: *build_template

    tags:

        - openmp

        - gpu

    variables:

        <<: *default_cmake_flags

        WITH_OPENMP: "yes"

        WITH_CUDA: "yes"

        BUILD_TYPE: Debug



cuda+openmp_Release:

    <<: *build_template

    tags:

        - openmp

        - gpu

    variables:

        <<: *default_cmake_flags

        WITH_OPENMP: "yes"

        WITH_CUDA: "yes"

        BUILD_TYPE: Release



default_Debug:

    <<: *build_template



default_Release:

    <<: *build_template

    variables:

        <<: *default_cmake_flags

        BUILD_TYPE: Release



openmp_Debug:

    <<: *build_template

    tags:

        - openmp

    variables:

        <<: *default_cmake_flags

        WITH_OPENMP: "yes"

        BUILD_TYPE: Debug



openmp_Release:

    <<: *build_template

    tags:

        - openmp

    variables:

        <<: *default_cmake_flags

        WITH_OPENMP: "yes"

        BUILD_TYPE: Release

.project

deleted100644 → 0
+0 −34
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<projectDescription>

	<name>tnl</name>

	<comment></comment>

	<projects>

		<project>geom-flow</project>

		<project>image-flow</project>

	</projects>

	<buildSpec>

		<buildCommand>

			<name>org.python.pydev.PyDevBuilder</name>

			<arguments>

			</arguments>

		</buildCommand>

		<buildCommand>

			<name>org.eclipse.linuxtools.cdt.autotools.genmakebuilder</name>

			<arguments>

			</arguments>

		</buildCommand>

		<buildCommand>

			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>

			<arguments>

			</arguments>

		</buildCommand>

	</buildSpec>

	<natures>

		<nature>org.eclipse.cdt.core.cnature</nature>

		<nature>org.eclipse.cdt.core.ccnature</nature>

		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>

		<nature>org.eclipse.linuxtools.cdt.autotools.autotoolsNature</nature>

		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>

		<nature>org.python.pydev.pythonNature</nature>

	</natures>

</projectDescription>

.pydevproject

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8" standalone="no"?>

<?eclipse-pydev version="1.0"?>



<pydev_project>

<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.6</pydev_property>

<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>

</pydev_project>

.settings/org.eclipse.ltk.core.refactoring.prefs

deleted100644 → 0
+0 −3
Original line number Diff line number Diff line 
#Thu Nov 19 13:52:11 CET 2009

eclipse.preferences.version=1

org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false