file names cleanup

dmitrygx · Dec 27, 2018 · d6d7c78 · d6d7c78
1 parent 8b7f502
commit d6d7c78
Show file tree

Hide file tree

Showing 21 changed files with 331 additions and 36 deletions.
diff --git a/benchmarks/bibw-asyncio.py b/benchmarks/bibw-asyncio.py
@@ -1,7 +1,7 @@
 # Copyright (c) 2018, NVIDIA CORPORATION. All rights reserved.
 # See file LICENSE for terms.
 
-import call_myucp as ucp
+import ucp_py as ucp
 import time
 import argparse
 import asyncio

diff --git a/benchmarks/bibw-future.py b/benchmarks/bibw-future.py
@@ -1,7 +1,7 @@
 # Copyright (c) 2018, NVIDIA CORPORATION. All rights reserved.
 # See file LICENSE for terms.
 
-import call_myucp as ucp
+import ucp_py as ucp
 import time
 import argparse
 import concurrent.futures

diff --git a/benchmarks/lat-asyncio-blind-recv.py b/benchmarks/lat-asyncio-blind-recv.py
@@ -1,7 +1,7 @@
 # Copyright (c) 2018, NVIDIA CORPORATION. All rights reserved.
 # See file LICENSE for terms.
 
-import call_myucp as ucp
+import ucp_py as ucp
 import time
 import argparse
 import asyncio

diff --git a/benchmarks/lat-asyncio-fast.py b/benchmarks/lat-asyncio-fast.py
@@ -1,7 +1,7 @@
 # Copyright (c) 2018, NVIDIA CORPORATION. All rights reserved.
 # See file LICENSE for terms.
 
-import call_myucp as ucp
+import ucp_py as ucp
 import time
 import argparse
 import asyncio

diff --git a/benchmarks/lat-asyncio.py b/benchmarks/lat-asyncio.py
@@ -1,7 +1,7 @@
 # Copyright (c) 2018, NVIDIA CORPORATION. All rights reserved.
 # See file LICENSE for terms.
 
-import call_myucp as ucp
+import ucp_py as ucp
 import time
 import argparse
 import asyncio

diff --git a/benchmarks/lat-fast.py b/benchmarks/lat-fast.py
@@ -1,7 +1,7 @@
 # Copyright (c) 2018, NVIDIA CORPORATION. All rights reserved.
 # See file LICENSE for terms.
 
-import call_myucp as ucp
+import ucp_py as ucp
 import time
 import argparse
 import concurrent.futures

diff --git a/benchmarks/lat-future.py b/benchmarks/lat-future.py
@@ -1,7 +1,7 @@
 # Copyright (c) 2018, NVIDIA CORPORATION. All rights reserved.
 # See file LICENSE for terms.
 
-import call_myucp as ucp
+import ucp_py as ucp
 import time
 import argparse
 import concurrent.futures

diff --git a/benchmarks/unibw-asyncio.py b/benchmarks/unibw-asyncio.py
@@ -1,7 +1,7 @@
 # Copyright (c) 2018, NVIDIA CORPORATION. All rights reserved.
 # See file LICENSE for terms.
 
-import call_myucp as ucp
+import ucp_py as ucp
 import time
 import argparse
 import asyncio

diff --git a/benchmarks/unibw-future.py b/benchmarks/unibw-future.py
@@ -1,7 +1,7 @@
 # Copyright (c) 2018, NVIDIA CORPORATION. All rights reserved.
 # See file LICENSE for terms.
 
-import call_myucp as ucp
+import ucp_py as ucp
 import time
 import argparse
 import concurrent.futures

diff --git a/pybind/common.h b/pybind/common.h
@@ -5,6 +5,8 @@ struct data_buf {
     void            *buf;
 };
 
+#define DEBUG 0
+
 #if DEBUG
 #define DEBUG_PRINT(...) fprintf(stderr, __VA_ARGS__);
 #else

diff --git a/pybind/setup.py b/pybind/setup.py
@@ -21,23 +21,23 @@
     cuda_dir=os.environ['UCX_PY_CUDA_PATH']
 
 try:
-    print("building libmyucp.a")
+    print("building libucp_py_ucp_fxns.a")
     print("getcwd: " + str(os.getcwd()))
-    assert os.system("gcc -shared -fPIC -c myucp.c -o myucp.o") == 0
+    assert os.system("gcc -shared -fPIC -c ucp_py_ucp_fxns.c -o ucp_py_ucp_fxns.o") == 0
     assert os.system("gcc -shared -fPIC -c buffer_ops.c -o buffer_ops.o") == 0
-    assert os.system("ar rcs libmyucp.a myucp.o buffer_ops.o") == 0
+    assert os.system("ar rcs libucp_py_ucp_fxns.a ucp_py_ucp_fxns.o buffer_ops.o") == 0
 except:
-    if not os.path.exists("libmyucp.a"):
-        print("Error building external library, please create libmyucp.a manually.")
+    if not os.path.exists("libucp_py_ucp_fxns.a"):
+        print("Error building external library, please create libucp_py_ucp_fxns.a manually.")
         sys.exit(1)
 
 ext_modules = cythonize([
-    Extension("call_myucp",
-              sources=["call_myucp.pyx"],
+    Extension("ucp_py",
+              sources=["ucp_py.pyx"],
               include_dirs=[os.getcwd(), ucx_dir+'/include', cuda_dir+'/include'],
               library_dirs=[os.getcwd(), ucx_dir+'/lib', cuda_dir+'/lib64'],
               runtime_library_dirs=[os.getcwd(), ucx_dir+'/lib', cuda_dir+'/lib64'],
-              libraries=['myucp', 'ucp', 'uct', 'ucm', 'ucs', 'cuda', 'cudart'])
+              libraries=['ucp_py_ucp_fxns', 'ucp', 'uct', 'ucm', 'ucs', 'cuda', 'cudart'])
 ])
 
 setup(