Remove references to OpenMP.

Author: HexDecimal

.travis.yml

@@ -41,7 +41,6 @@ services:
 
 before_install:
 - source .travis/before_install.sh
-- 'if [[ "$TRAVIS_OS_NAME" == "osx" && "$USE_OPENMP" == "true" ]]; then source .travis/install_openmp.sh; fi'
 - source .travis/install_python.sh
 - 'wget https://bootstrap.pypa.io/get-pip.py'
 - python get-pip.py

.travis/install_openmp.sh

@@ -51,7 +51,7 @@ For the most part it's just::
 * Python 3.5+
 * Windows, Linux, or MacOS X 10.9+.
 * On Windows, requires the Visual C++ runtime 2015 or later.
-* On Linux, requires libsdl2 (2.0.5+) and libomp5 to run.
+* On Linux, requires libsdl2 (2.0.5+).
 
 =========
  License

README.rst

@@ -307,12 +307,6 @@ def fix_header(filepath: str) -> None:
         .split()
     )
 
-# Can force the use of OpenMP with this variable.
-try:
-    USE_OPENMP = eval(os.environ.get("USE_OPENMP", "False").title())
-except Exception:
-    USE_OPENMP = False
-
 tdl_build = os.environ.get("TDL_BUILD", "RELEASE").upper()
 
 MSVC_CFLAGS = {"DEBUG": ["/Od"], "RELEASE": ["/GL", "/O2", "/GS-", "/wd4996"]}
@@ -332,21 +326,9 @@ def fix_header(filepath: str) -> None:
 if sys.platform == "win32" and "--compiler=mingw32" not in sys.argv:
     extra_compile_args.extend(MSVC_CFLAGS[tdl_build])
     extra_link_args.extend(MSVC_LDFLAGS[tdl_build])
-
-    if USE_OPENMP is None:
-        USE_OPENMP = sys.version_info[:2] >= (3, 5)
-
-    if USE_OPENMP:
-        extra_compile_args.append("/openmp")
 else:
     extra_compile_args.extend(GCC_CFLAGS[tdl_build])
     extra_link_args.extend(GCC_CFLAGS[tdl_build])
-    if USE_OPENMP is None:
-        USE_OPENMP = sys.platform != "darwin"
-
-    if USE_OPENMP:
-        extra_compile_args.append("-fopenmp")
-        extra_link_args.append("-fopenmp")
 
 ffi = FFI()
 parse_sdl2.add_to_ffi(ffi, SDL2_INCLUDE)

build_libtcod.py

@@ -20,10 +20,8 @@ void NoiseSampleMeshGrid(
     const long len,
     const float* __restrict in,
     float* __restrict out) {
-#pragma omp parallel
   {
     long i;
-#pragma omp for schedule(static)
     for (i = 0; i < len; ++i) {
       int axis;
       float xyzw[TCOD_NOISE_MAX_DIMENSIONS];
@@ -64,11 +62,9 @@ void NoiseSampleOpenMeshGrid(
     const long* __restrict shape,
     const float* __restrict* __restrict ogrid_in,
     float* __restrict out) {
-#pragma omp parallel
   {
     long i;
     long len = GetSizeFromShape(ndim_in, shape);
-#pragma omp for schedule(static)
     for (i = 0; i < len; ++i) {
       out[i] = GetOpenMeshGridValue(noise, ndim_in, shape, ogrid_in, i);
     }