diff --git a/appveyor.yml b/appveyor.yml index 50e9ba6..b5f335c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -17,6 +17,10 @@ environment: CONDA_PY: 27 CONDA_INSTALL_LOCN: C:\\Miniconda-x64 + - TARGET_ARCH: x86 + CONDA_PY: 36 + CONDA_INSTALL_LOCN: C:\\Miniconda36 + - TARGET_ARCH: x64 CONDA_PY: 36 CONDA_INSTALL_LOCN: C:\\Miniconda36-x64 diff --git a/recipe/VC14_32bit.diff b/recipe/VC14_32bit.diff new file mode 100644 index 0000000..0e04e22 --- /dev/null +++ b/recipe/VC14_32bit.diff @@ -0,0 +1,13 @@ +diff --git src/cl/include/private/Random123/features/sse.h src/cl/include/private/Random123/features/sse.h +index 88efd65..c6a13c5 100644 +--- src/cl/include/private/Random123/features/sse.h ++++ src/cl/include/private/Random123/features/sse.h +@@ -90,7 +90,7 @@ R123_STATIC_INLINE int haveAESNI(){ + // R123_USE_feature tests for each of these in each of the + // compilerfeatures.h files we just keep the complexity localized + // to here... +-#if (defined(__ICC) && __ICC<1210) || (defined(_MSC_VER) && !defined(_WIN64)) ++#if (defined(__ICC) && __ICC<1210) || (defined(_MSC_VER) && !defined(_WIN64) && _MSC_VER<1900) + /* Is there an intrinsic to assemble an __m128i from two 64-bit words? + If not, use the 4x32-bit intrisic instead. N.B. It looks like Intel + added _mm_set_epi64x to icc version 12.1 in Jan 2012. diff --git a/recipe/meta.yaml b/recipe/meta.yaml index faadd4b..b284c99 100755 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -12,21 +12,24 @@ source: fn: {{ name }}-{{ version }}.tar.gz url: https://github.com/clMathLibraries/{{ name }}/archive/v{{ version }}.tar.gz sha256: {{ sha256 }} + patches: + ############################################################## + # Fixes an issue where `_mm_set_epi64x` is already defined # + # in Windows 32-bit's VC 2015. # + # # + # xref: https://github.com/clMathLibraries/clRNG/pull/15 # + ############################################################## + - VC14_32bit.diff build: - number: 0 + number: 1 script_env: - OSX_VARIANT {% if OSX_VARIANT != "native" %} skip: True # [not osx] {% else %} - ############################################################# - # Skip Visual Studio 2015 32-bit builds due to a bug. # - # # - # xref: https://github.com/clMathLibraries/clRNG/issues/11 # - ############################################################# - skip: True # [(win and py35) or (win32 and py36)] + skip: True # [win and py35] {% endif %} features: