Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable Windows VC14 32-bit #1

Merged
merged 4 commits into from
Jul 8, 2017
Merged

Enable Windows VC14 32-bit #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
62947ee
Drop skip on Windows Python 3.6 (VC 14) 32-bit
jakirkham Jul 7, 2017
9184b9e
MNT: Re-rendered with conda-smithy 2.3.2
jakirkham Jul 7, 2017
f6e308e
Add a patch for VC 2015 32-bit builds
jakirkham Jul 8, 2017
7d3dffb
Bump build number to 1
jakirkham Jul 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 13 additions & 0 deletions recipe/VC14_32bit.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
17 changes: 10 additions & 7 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Submitted as a patch upstream.

xref: clMathLibraries/clRNG#15


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:
Expand Down