diff --git a/Dockerfile b/Dockerfile index 1ed71da993..fb68b8a083 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,8 @@ FROM pygdf ADD ml-prims /cuML/ml-prims ADD cuML /cuML/cuML ADD python /cuML/python +ADD setup.py /cuML/setup.py -WORKDIR /cuML/python +WORKDIR /cuML RUN source activate gdf && conda install cython RUN source activate gdf && python setup.py install diff --git a/python/setup.py b/setup.py similarity index 93% rename from python/setup.py rename to setup.py index 9a06691e03..73407ea930 100644 --- a/python/setup.py +++ b/setup.py @@ -119,8 +119,8 @@ def build_extensions(self): ext = Extension('cuML', - sources=['../cuML/src/pca/pca.cu', '../cuML/src/tsvd/tsvd.cu', '../cuML/src/dbscan/dbscan.cu', 'cuML/cuml.pyx'], - depends=['../cuML/src/tsvd/tsvd.cu'], + sources=['cuML/src/pca/pca.cu', 'cuML/src/tsvd/tsvd.cu', 'cuML/src/dbscan/dbscan.cu', 'python/cuML/cuml.pyx'], + depends=['cuML/src/tsvd/tsvd.cu'], library_dirs=[CUDA['lib64']], libraries=['cudart','cublas','cusolver'], language='c++', @@ -128,7 +128,7 @@ def build_extensions(self): # this syntax is specific to this build system extra_compile_args={'gcc': ['-std=c++11'], 'nvcc': ['-arch=sm_60', '--ptxas-options=-v', '-c', '--compiler-options', "'-fPIC'",'-std=c++11','--expt-extended-lambda']}, - include_dirs = [numpy_include, CUDA['include'], '../cuML/src', '../cuML/external/ml-prims/src','../cuML/external/ml-prims/external/cutlass', '../cuML/external/cutlass','../cuML/external/ml-prims/external/cub'], + include_dirs = [numpy_include, CUDA['include'], 'cuML/src', 'cuML/external/ml-prims/src','cuML/external/ml-prims/external/cutlass', 'cuML/external/cutlass','cuML/external/ml-prims/external/cub'], extra_link_args=["-std=c++11"])