merge

.hgignore

 syntax: glob
-
-*.o
-*.orig
 *.pyc
-*.pyo
-*.so
-*.sw?
 *~
-Theano.egg-info
-\#*\#
-build
-compiled/*.cpp
-core.*
-cutils_ext.cpp
-dist
-doc/.build/
-doc/indexes/oplist.txt
-doc/indexes/typelist.txt
-html
-pdf
-pull.sh
-setuptools-*.egg
+*.so
\ No newline at end of file

Makefile

+CUDA_NDARRAY?=$(HOME)/cvs/lgcm/cuda_ndarray
 
-
-type_support.so : type_support.cu $(HOME)/cvs/lgcm/cuda_ndarray/cuda_ndarray.so
-	nvcc -g -shared -I$(HOME)/cvs/lgcm/cuda_ndarray -I$(CUDA_ROOT)/include -I/usr/include/python2.6 -o type_support.so -Xcompiler -fPIC type_support.cu -L$(CUDA_ROOT)/lib -L$(HOME)/cvs/lgcm/cuda_ndarray -lcuda_ndarray
+type_support.so : type_support.cu $(CUDA_NDARRAY)/cuda_ndarray.so
+	nvcc -g -shared -I$(CUDA_NDARRAY) -I$(CUDA_ROOT)/include -I/usr/include/python2.6 -o type_support.so -Xcompiler -fPIC type_support.cu -L$(CUDA_ROOT)/lib -L$(CUDA_NDARRAY) -lcuda_ndarray
 
 clean : 
 	rm type_support.so