Merge pull request #305 from nouiz/conda

Conda

Author: abergeron

CMakeLists.txt

@@ -4,7 +4,13 @@ PROJECT(libgpuarray C)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/CMakeModules/")
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
+# -Wall is unbelieveably noisy with Visual Studio:
+# http://stackoverflow.com/q/4001736/3257826
+if(MSVC)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -W4")
+else()
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
+endif()
 
 enable_testing()
 

setup.py

@@ -76,15 +76,15 @@ def __init__(self, *args, **kwargs):
 
 include_dirs = [np.get_include()]
 library_dirs = []
-if sys.platform == 'win32':
+if sys.platform == 'win32' and not os.getenv('CONDA_BUILD'):
     # This is a hack so users don't need to do many steps for windows install
     # Just use the default location.
     current_dir = os.path.abspath(os.path.dirname(__file__))
     include_dirs += [os.path.join(current_dir, 'src')]
 
     default_bin_dir = os.path.join(current_dir, 'lib', 'Release')
     if not os.path.isdir(default_bin_dir):
-        raise RuntimeError('default binary dir {} does not exist, you may need to build the C library in release mode')
+        raise RuntimeError('default binary dir {} does not exist, you may need to build the C library in release mode'.format(default_bin_dir))
     library_dirs += [default_bin_dir]
 
 with open('pygpu/version.py', 'w') as f:

src/util/integerfactoring.c

@@ -1,6 +1,7 @@
 /* Includes */
 #include <stdio.h>
 #include <stdlib.h>
+#include <gpuarray/config.h>
 #include <string.h>
 #include "integerfactoring.h"