Skip to content
Snippets Groups Projects
Commit f97a4441 authored by Markus Holzer's avatar Markus Holzer Committed by Michael Kuron
Browse files

Enable all test cases in windows pipeline

parent 2f2fce8a
No related merge requests found
...@@ -90,12 +90,12 @@ minimal-windows: ...@@ -90,12 +90,12 @@ minimal-windows:
tags: tags:
- win - win
script: script:
- export NUM_CORES=$(nproc --all)
- source /cygdrive/c/Users/build/Miniconda3/Scripts/activate - source /cygdrive/c/Users/build/Miniconda3/Scripts/activate
- source activate pystencils_dev - source activate pystencils
- env - pip list
- conda env list
- python -c "import numpy" - python -c "import numpy"
- python setup.py quicktest - py.test -v -m "not (notebook or longrun)"
ubuntu: ubuntu:
stage: test stage: test
......
...@@ -160,7 +160,7 @@ def read_config(): ...@@ -160,7 +160,7 @@ def read_config():
('msvc_version', 'latest'), ('msvc_version', 'latest'),
('llc_command', get_llc_command() or 'llc'), ('llc_command', get_llc_command() or 'llc'),
('arch', 'x64'), ('arch', 'x64'),
('flags', '/Ox /fp:fast /openmp /arch:avx'), ('flags', '/Ox /fp:fast /OpenMP /arch:avx'),
('restrict_qualifier', '__restrict') ('restrict_qualifier', '__restrict')
]) ])
elif platform.system().lower() == 'darwin': elif platform.system().lower() == 'darwin':
......
...@@ -338,7 +338,7 @@ def discretize_staggered(term, symbols_to_field_dict, coordinate, coordinate_off ...@@ -338,7 +338,7 @@ def discretize_staggered(term, symbols_to_field_dict, coordinate, coordinate_off
offset = [0] * dim offset = [0] * dim
offset[coordinate] = coordinate_offset offset[coordinate] = coordinate_offset
offset = np.array(offset, dtype=np.int) offset = np.array(offset, dtype=int)
gradient = grad(symbols)[coordinate] gradient = grad(symbols)[coordinate]
substitutions.update({s: (field[offset](i) + field(i)) / 2 for i, s in enumerate(symbols)}) 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): ...@@ -386,7 +386,7 @@ def discretize_divergence(vector_term, symbols_to_field_dict, dx):
def __up_down_offsets(d, dim): def __up_down_offsets(d, dim):
coord = [0] * dim coord = [0] * dim
coord[d] = 1 coord[d] = 1
up = np.array(coord, dtype=np.int) up = np.array(coord, dtype=int)
coord[d] = -1 coord[d] = -1
down = np.array(coord, dtype=np.int) down = np.array(coord, dtype=int)
return up, down return up, down
#if !defined(__AES__) || !defined(__SSE4_1__)
#error AES-NI and SSE4.1 need to be enabled
#endif
#include <emmintrin.h> // SSE2 #include <emmintrin.h> // SSE2
#include <wmmintrin.h> // AES #include <wmmintrin.h> // AES
#ifdef __AVX512VL__ #ifdef __AVX512VL__
......
...@@ -114,8 +114,8 @@ def test_Basic_data_type(): ...@@ -114,8 +114,8 @@ def test_Basic_data_type():
assert s.dtype.is_uint() assert s.dtype.is_uint()
assert s.dtype.is_complex() == 0 assert s.dtype.is_complex() == 0
assert typed_symbols(("s"), np.str).dtype.is_other() assert typed_symbols(("s"), str).dtype.is_other()
assert typed_symbols(("s"), np.bool).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.void).dtype.is_other()
assert typed_symbols(("s"), np.float64).dtype.base_name == 'double' assert typed_symbols(("s"), np.float64).dtype.base_name == 'double'
......
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