Merge branch 'holzer-master-patch-01410' into 'master'

Enable all test cases in windows pipeline

See merge request pycodegen/pystencils!209

.gitlab-ci.yml

@@ -90,12 +90,12 @@ minimal-windows:
   tags:
     - win
   script:
+    - export NUM_CORES=$(nproc --all)
     - source /cygdrive/c/Users/build/Miniconda3/Scripts/activate
-    - source activate pystencils_dev
-    - env
-    - conda env list
+    - source activate pystencils
+    - pip list
     - python -c "import numpy"
-    - python setup.py quicktest
+    - py.test -v -m "not (notebook or longrun)"
 
 ubuntu:
   stage: test

pystencils/cpu/cpujit.py

@@ -160,7 +160,7 @@ def read_config():
             ('msvc_version', 'latest'),
             ('llc_command', get_llc_command() or 'llc'),
             ('arch', 'x64'),
-            ('flags', '/Ox /fp:fast /openmp /arch:avx'),
+            ('flags', '/Ox /fp:fast /OpenMP /arch:avx'),
             ('restrict_qualifier', '__restrict')
         ])
     elif platform.system().lower() == 'darwin':

pystencils/fd/finitedifferences.py

@@ -338,7 +338,7 @@ def discretize_staggered(term, symbols_to_field_dict, coordinate, coordinate_off
 
         offset = [0] * dim
         offset[coordinate] = coordinate_offset
-        offset = np.array(offset, dtype=np.int)
+        offset = np.array(offset, dtype=int)
 
         gradient = grad(symbols)[coordinate]
         substitutions.update({s: (field[offset](i) + field(i)) / 2 for i, s in enumerate(symbols)})
@@ -386,7 +386,7 @@ def discretize_divergence(vector_term, symbols_to_field_dict, dx):
 def __up_down_offsets(d, dim):
     coord = [0] * dim
     coord[d] = 1
-    up = np.array(coord, dtype=np.int)
+    up = np.array(coord, dtype=int)
     coord[d] = -1
-    down = np.array(coord, dtype=np.int)
+    down = np.array(coord, dtype=int)
     return up, down

pystencils/include/aesni_rand.h

-#if !defined(__AES__) || !defined(__SSE4_1__)
-#error AES-NI and SSE4.1 need to be enabled
-#endif
-
 #include <emmintrin.h> // SSE2
 #include <wmmintrin.h> // AES
 #ifdef __AVX512VL__

pystencils_tests/test_types.py

@@ -114,8 +114,8 @@ def test_Basic_data_type():
     assert s.dtype.is_uint()
     assert s.dtype.is_complex() == 0
 
-    assert typed_symbols(("s"), np.str).dtype.is_other()
-    assert typed_symbols(("s"), np.bool).dtype.is_other()
+    assert typed_symbols(("s"), str).dtype.is_other()
+    assert typed_symbols(("s"), bool).dtype.is_other()
     assert typed_symbols(("s"), np.void).dtype.is_other()
 
     assert typed_symbols(("s"), np.float64).dtype.base_name == 'double'