Commit 5f96473c authored by Christian Godenschwager's avatar Christian Godenschwager

Merge branch 'intel19' into 'master'

Add Intel 2019 compiler to CI

See merge request !138
parents a456342b e62e83cf
Pipeline #11574 passed with stages
in 677 minutes and 58 seconds
......@@ -348,9 +348,9 @@ intel_18_hybrid:
variables:
<<: *build_hybrid_variables
WALBERLA_BUILD_WITH_CUDA: "OFF"
except:
only:
variables:
- $DISABLE_PER_COMMIT_BUILDS
- $ENABLE_NIGHTLY_BUILDS
tags:
- docker
- intel
......@@ -361,9 +361,9 @@ intel_18_serial_dbg:
variables:
<<: *build_serial_dbg_variables
WALBERLA_BUILD_WITH_CUDA: "OFF"
except:
only:
variables:
- $DISABLE_PER_COMMIT_BUILDS
- $ENABLE_NIGHTLY_BUILDS
tags:
- docker
- intel
......@@ -374,9 +374,9 @@ intel_18_mpionly_dbg:
variables:
<<: *build_mpionly_dbg_variables
WALBERLA_BUILD_WITH_CUDA: "OFF"
except:
only:
variables:
- $DISABLE_PER_COMMIT_BUILDS
- $ENABLE_NIGHTLY_BUILDS
tags:
- docker
- intel
......@@ -387,9 +387,9 @@ intel_18_hybrid_dbg:
variables:
<<: *build_hybrid_dbg_variables
WALBERLA_BUILD_WITH_CUDA: "OFF"
except:
only:
variables:
- $DISABLE_PER_COMMIT_BUILDS
- $ENABLE_NIGHTLY_BUILDS
tags:
- docker
- intel
......@@ -397,6 +397,97 @@ intel_18_hybrid_dbg:
intel_18_hybrid_dbg_sp:
<<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:18
variables:
<<: *build_hybrid_dbg_sp_variables
WALBERLA_BUILD_WITH_CUDA: "OFF"
only:
variables:
- $ENABLE_NIGHTLY_BUILDS
tags:
- docker
- intel
intel_19_serial:
<<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:19
variables:
<<: *build_serial_variables
WALBERLA_BUILD_WITH_CUDA: "OFF"
only:
variables:
- $ENABLE_NIGHTLY_BUILDS
tags:
- docker
- intel
intel_19_mpionly:
<<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:19
variables:
<<: *build_mpionly_variables
WALBERLA_BUILD_WITH_CUDA: "OFF"
only:
variables:
- $ENABLE_NIGHTLY_BUILDS
tags:
- docker
- intel
intel_19_hybrid:
<<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:19
variables:
<<: *build_hybrid_variables
WALBERLA_BUILD_WITH_CUDA: "OFF"
except:
variables:
- $DISABLE_PER_COMMIT_BUILDS
tags:
- docker
- intel
intel_19_serial_dbg:
<<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:19
variables:
<<: *build_serial_dbg_variables
WALBERLA_BUILD_WITH_CUDA: "OFF"
except:
variables:
- $DISABLE_PER_COMMIT_BUILDS
tags:
- docker
- intel
intel_19_mpionly_dbg:
<<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:19
variables:
<<: *build_mpionly_dbg_variables
WALBERLA_BUILD_WITH_CUDA: "OFF"
except:
variables:
- $DISABLE_PER_COMMIT_BUILDS
tags:
- docker
- intel
intel_19_hybrid_dbg:
<<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:19
variables:
<<: *build_hybrid_dbg_variables
WALBERLA_BUILD_WITH_CUDA: "OFF"
except:
variables:
- $DISABLE_PER_COMMIT_BUILDS
tags:
- docker
- intel
intel_19_hybrid_dbg_sp:
<<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:19
variables:
<<: *build_hybrid_dbg_sp_variables
WALBERLA_BUILD_WITH_CUDA: "OFF"
......
......@@ -719,7 +719,7 @@ void DynamicCurveBalance< PhantomData_T >::mortonOrderWeighted( const std::vecto
}
}
#if defined(_OPENMP) && (__INTEL_COMPILER != 1800) // Disable OpenMP for Intel 2018 due to a bug
#if defined(_OPENMP) && ((__INTEL_COMPILER < 1800) || (__INTEL_COMPILER > 1900)) // Disable OpenMP for Intel 2018/2019 due to a bug
#pragma omp parallel for schedule(static)
#endif
for( int i = 0; i < int_c( blocksPerLevel.size() ); ++i )
......
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