fixed

Author: zeng-qinghui

.gitignore

@@ -4,4 +4,5 @@ out
 dist
 build
 pynvjpeg.egg-info
-pynvjpeg
+pynvjpeg
+MANIFEST

Makefile

@@ -15,40 +15,41 @@ ifndef PYTHON_BIN
 PYTHON_BIN=python${PYTHON_VERSION}
 endif
 
-ifndef PYTHON_INCLUDE_PATH
-PYTHON_INCLUDE_PATH=/usr/include/python${PYTHON_VERSION}
-endif
+# ifndef PYTHON_INCLUDE_PATH
+# PYTHON_INCLUDE_PATH=/usr/include/python${PYTHON_VERSION}
+# endif
 
-ifndef PYTHON_LIB_PATH
-PYTHON_LIB_PATH=$(shell ldconfig -p | grep python${PYTHON_VERSION} | head -n 1 | xargs dirname | tail -n 1)
-endif
+# ifndef PYTHON_LIB_PATH
+# PYTHON_LIB_PATH=$(shell ldconfig -p | grep python${PYTHON_VERSION} | head -n 1 | xargs dirname | tail -n 1)
+# endif
 
-ifndef PYTHON_DYNLOAD_PATH
-PYTHON_DYNLOAD_PATH=$(shell ${PYTHON_BIN} -c "import sys; print(list(filter(lambda x: 'lib-dynload' in x, sys.path))[0])")
-endif
+# ifndef PYTHON_DYNLOAD_PATH
+# PYTHON_DYNLOAD_PATH=$(shell ${PYTHON_BIN} -c "import sys; print(list(filter(lambda x: 'lib-dynload' in x, sys.path))[0])")
+# endif
 
-PYTHON_LIB_NAME=$(shell ${PYTHON_BIN} -c "import sys; print('nvjpeg.cpython-%d%dm' % (sys.version_info.major, sys.version_info.minor,))")-x86_64-linux-gnu.so
+# PYTHON_LIB_NAME=$(shell ${PYTHON_BIN} -c "import sys; print('nvjpeg.cpython-%d%dm' % (sys.version_info.major, sys.version_info.minor,))")-x86_64-linux-gnu.so
 
-all: out/nvjpeg-test out/${PYTHON_LIB_NAME}
+# all: out/nvjpeg-test out/${PYTHON_LIB_NAME}
+all: out/nvjpeg-test python-interface
 out:
 	mkdir out
 
 out/nvjpeg-test.o: out nvjpeg-python.c
-	gcc -o out/nvjpeg-test.o -c nvjpeg-python.c -I${CUDA_PATH}/include -I${PYTHON_INCLUDE_PATH} -D BUILD_TEST ${CFLAGS}
+	gcc -o out/nvjpeg-test.o -c nvjpeg-python.c -I${CUDA_PATH}/include -D BUILD_TEST ${CFLAGS}
 
 out/nvjpeg-test: out/nvjpeg-test.o
-	gcc -o out/nvjpeg-test out/nvjpeg-test.o -L${CUDA_PATH}/lib64 -lnvjpeg -lcudart -L${PYTHON_LIB_PATH} -lpython${PYTHON_VERSION}m ${CFLAGS}
+	gcc -o out/nvjpeg-test out/nvjpeg-test.o -L${CUDA_PATH}/lib64 -lnvjpeg -lcudart ${CFLAGS}
 
-out/nvjpeg-python.o: out nvjpeg-python.c
-	gcc -fPIC -o out/nvjpeg-python.o -c nvjpeg-python.c -I${CUDA_PATH}/include -I${PYTHON_INCLUDE_PATH} ${CFLAGS}
+# out/nvjpeg-python.o: out nvjpeg-python.c
+# 	gcc -fPIC -o out/nvjpeg-python.o -c nvjpeg-python.c -I${CUDA_PATH}/include -I${PYTHON_INCLUDE_PATH} ${CFLAGS}
 
-out/${PYTHON_LIB_NAME}: out/nvjpeg-python.o
-	gcc --shared -fPIC -o out/${PYTHON_LIB_NAME} out/nvjpeg-python.o -L${CUDA_PATH}/lib64 -lnvjpeg -lcudart -L${PYTHON_LIB_PATH} -lpython${PYTHON_VERSION}m ${CFLAGS}
-	mkdir -p pynvjpeg/lib
-	cp -f out/${PYTHON_LIB_NAME} pynvjpeg/lib/${PYTHON_LIB_NAME}
+# out/${PYTHON_LIB_NAME}: out/nvjpeg-python.o
+# 	gcc --shared -fPIC -o out/${PYTHON_LIB_NAME} out/nvjpeg-python.o -L${CUDA_PATH}/lib64 -lnvjpeg -lcudart -L${PYTHON_LIB_PATH} -lpython${PYTHON_VERSION}m ${CFLAGS}
+python-interface:
+	${PYTHON_BIN} setup.py build_ext
 
 clean:
-	rm -Rf out dist build out pynvjpeg.egg-info
+	rm -Rf out build dist pynvjpeg.egg-info
 
 # install: out/${PYTHON_LIB_NAME}
 # 	cp -f out/${PYTHON_LIB_NAME} ${PYTHON_DYNLOAD_PATH}

README.md

@@ -22,7 +22,7 @@ make install
 ```python
 #!/usr/bin/env python3
 
-from pynvjpeg import NvJpeg 
+from nvjpeg import NvJpeg 
 
 # read file
 fp = open("input-image.jpg", "rb")

nvjpeg-python.c

@@ -3,12 +3,13 @@
 #include <malloc.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+
+#ifndef BUILD_TEST
 #include <Python.h>
 #include <structmember.h>
-
 #define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
 #include <numpy/arrayobject.h>
-
+#endif
 
 typedef struct
 {
@@ -241,7 +242,7 @@ int main(int args, char** argv){
     return 0;
 }
 
-#endif
+#else
 
 typedef struct
 {
@@ -404,3 +405,5 @@ PyInit_nvjpeg(void) {
     return pReturn;
 }
 
+
+#endif

setup.py

@@ -1,26 +1,24 @@
-#!/usr/bin/env python3
-import setuptools
+#!/usr/bin/env python
 import sys
 import os
 import glob
-
-pwd = os.path.abspath(os.path.dirname(__file__))
-os.system("cd '%s'; make" % (pwd,))
+from setuptools import setup, find_packages, Extension
 
 with open("README.md", "r", encoding="utf-8") as fh:
     long_description = fh.read()
 
-setuptools.setup(
-    name="pynvjpeg",
-    version="0.0.1",
+from distutils.core import setup, Extension
+setup(name='pynvjpeg',
+    version='0.0.2',
+    ext_modules=[Extension('nvjpeg', ['nvjpeg-python.c'])],
     author="Usingnet",
-    author_email="zengqinghui@usingnet.com",
+    author_email="developer@usingnet.com",
     license="MIT",
     description="nvjpeg for python",
     long_description=long_description,
     long_description_content_type="text/markdown",
     url="https://github.com/UsingNet/nvjpeg-python",
-    packages=setuptools.find_packages(),
+    # packages=setuptools.find_packages(),
     classifiers=[
         "Development Status :: 4 - Beta",
         "Programming Language :: Python :: 3 :: Only",
@@ -35,10 +33,5 @@
         'Source': 'https://github.com/UsingNet/nvjpeg-python',
         'Tracker': 'https://github.com/UsingNet/nvjpeg-python/issues',
     },
-    data_files=[
-        ('', ['nvjpeg-python.c', 'Makefile']),
-        ('pynvjpeg/lib', glob.glob('%s/pynvjpeg/lib/*.so' % pwd))
-    ],
-    install_requires=['numpy']
+    install_requires=['numpy>=1.17']
 )
-

tests/test.py

@@ -4,10 +4,12 @@
 import os
 import numpy as np
 import cv2
+import glob
 
-sys.path.append(os.path.join(os.path.dirname(__file__), ".."))
+for lib in glob.glob(os.path.join(os.path.dirname(__file__), "../build/lib.*")):
+    sys.path.append(lib)
 
-from pynvjpeg import NvJpeg 
+from nvjpeg import NvJpeg 
 
 fp = open(os.path.join(os.path.dirname(__file__), "test.jpg"), "rb")
 img = fp.read()