diff options
| author | David Cournapeau <cournape@gmail.com> | 2009-11-30 17:34:56 +0000 |
|---|---|---|
| committer | David Cournapeau <cournape@gmail.com> | 2009-11-30 17:34:56 +0000 |
| commit | d4d34804676f06da528adffef24e7d0b7b194d9c (patch) | |
| tree | 45a8aa97edd78a86948545c1031a849ea7bbd943 | |
| parent | e0abf3b34a1e36a537ff0399743193a0878249a5 (diff) | |
| download | numpy-d4d34804676f06da528adffef24e7d0b7b194d9c.tar.gz | |
REL: re-enable SSE2 binary in the superpack.
| -rw-r--r-- | pavement.py | 4 | ||||
| -rw-r--r-- | tools/win32build/nsis_scripts/numpy-superinstaller.nsi.in | 38 |
2 files changed, 21 insertions, 21 deletions
diff --git a/pavement.py b/pavement.py index 7bcbdeafe..47f8dd63b 100644 --- a/pavement.py +++ b/pavement.py @@ -202,8 +202,8 @@ def bdist_superpack(options): bdist_wininst_arch(pyver, 'nosse') copy_bdist("nosse") - #bdist_wininst_arch(pyver, 'sse2') - #copy_bdist("sse2") + bdist_wininst_arch(pyver, 'sse2') + copy_bdist("sse2") bdist_wininst_arch(pyver, 'sse3') copy_bdist("sse3") diff --git a/tools/win32build/nsis_scripts/numpy-superinstaller.nsi.in b/tools/win32build/nsis_scripts/numpy-superinstaller.nsi.in index e37279012..739f56e66 100644 --- a/tools/win32build/nsis_scripts/numpy-superinstaller.nsi.in +++ b/tools/win32build/nsis_scripts/numpy-superinstaller.nsi.in @@ -99,16 +99,16 @@ Section "Core" SecCore Pop $0
StrCpy $HasSSE3 $0
- ; ; Debug
- ; StrCmp $HasSSE2 "Y" include_sse2 no_include_sse2
- ; include_sse2:
- ; DetailPrint '"Target CPU handles SSE2"'
- ; StrCpy $CPUSSE "2"
- ; goto done_sse2
- ; no_include_sse2:
- ; DetailPrint '"Target CPU does NOT handle SSE2"'
- ; goto done_sse2
- ; done_sse2:
+ ; Debug
+ StrCmp $HasSSE2 "Y" include_sse2 no_include_sse2
+ include_sse2:
+ DetailPrint '"Target CPU handles SSE2"'
+ StrCpy $CPUSSE "2"
+ goto done_sse2
+ no_include_sse2:
+ DetailPrint '"Target CPU does NOT handle SSE2"'
+ goto done_sse2
+ done_sse2:
StrCmp $HasSSE3 "Y" include_sse3 no_include_sse3
include_sse3:
@@ -130,10 +130,10 @@ Section "Core" SecCore DetailPrint '"nosse install (arch value: $option_arch)"'
StrCpy $CPUSSE "0"
${Break}
- ; ${Case} "sse2"
- ; DetailPrint '"sse2 install (arch value: $option_arch)"'
- ; StrCpy $CPUSSE "2"
- ; ${Break}
+ ${Case} "sse2"
+ DetailPrint '"sse2 install (arch value: $option_arch)"'
+ StrCpy $CPUSSE "2"
+ ${Break}
${Case} "sse3"
DetailPrint '"sse3 install (arch value: $option_arch)"'
StrCpy $CPUSSE "3"
@@ -151,11 +151,11 @@ Section "Core" SecCore File "binaries\@SSE3_BINARY@"
ExecWait '"$INSTDIR\@SSE3_BINARY@"'
${Break}
- ; ${Case} "2"
- ; DetailPrint '"Install SSE 2"'
- ; File "binaries\@SSE2_BINARY@"
- ; ExecWait '"$INSTDIR\@SSE2_BINARY@"'
- ; ${Break}
+ ${Case} "2"
+ DetailPrint '"Install SSE 2"'
+ File "binaries\@SSE2_BINARY@"
+ ExecWait '"$INSTDIR\@SSE2_BINARY@"'
+ ${Break}
${Default}
DetailPrint '"Install NO SSE"'
File "binaries\@NOSSE_BINARY@"
|