compiler flags update, v21

npy0 · Jun 18, 2020 · e272610 · e272610
1 parent 442e1fa
commit e272610
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 14 deletions.
diff --git a/setup.py b/setup.py
@@ -40,21 +40,21 @@ def get_work_ext_kwargs(use_gpu=False, link_omp=False, use_vc=False, platform=No
     e_args = {
         "name": "nanopy.work",
         "sources": ["nanopy/blake2b/blake2b.c", "nanopy/work.c"],
-        "extra_compile_args": [],
-        "extra_link_args": [],
+        "extra_compile_args": ["-O3", "-march=native"],
+        "extra_link_args": ["-O3", "-march=native"],
         "libraries": [],
         "define_macros": [],
     }
 
     if platform == "darwin":
         if use_gpu:
             e_args["define_macros"] = [("HAVE_OPENCL_OPENCL_H", "1")]
-            e_args["extra_link_args"] = ["-framework", "OpenCL"]
+            e_args["extra_link_args"].extend("-framework", "OpenCL")
         else:
             if link_omp:
                 e_args["libraries"] = ["omp"]
-            e_args["extra_compile_args"] = ["-fopenmp"]
-            e_args["extra_link_args"] = ["-fopenmp"]
+            e_args["extra_compile_args"].append("-fopenmp")
+            e_args["extra_link_args"].append("-fopenmp")
     elif platform in ["linux", "win32", "cygwin"]:
         if use_gpu:
             e_args["define_macros"] = [("HAVE_CL_CL_H", "1")]
@@ -75,8 +75,8 @@ def get_work_ext_kwargs(use_gpu=False, link_omp=False, use_vc=False, platform=No
                     "/arch:AVX2",
                 ]
             else:
-                e_args["extra_compile_args"] = ["-fopenmp"]
-                e_args["extra_link_args"] = ["-fopenmp"]
+                e_args["extra_compile_args"].append("-fopenmp")
+                e_args["extra_link_args"].append("-fopenmp")
     else:
         raise OSError("Unsupported OS platform")
 
@@ -100,8 +100,8 @@ def get_ed25519_blake2b_ext_kwargs(use_vc=False, platform=None):
             "nanopy/ed25519-donna/ed25519.c",
             "nanopy/ed25519_blake2b.c",
         ],
-        "extra_compile_args": [],
-        "extra_link_args": [],
+        "extra_compile_args": ["-O3", "-march=native"],
+        "extra_link_args": ["-O3", "-march=native"],
         "define_macros": [],
     }
 
@@ -142,7 +142,7 @@ def get_ed25519_blake2b_ext_kwargs(use_vc=False, platform=None):
 
 setup(
     name="nanopy",
-    version="20.0.0",
+    version="21.0.0",
     packages=["nanopy"],
     url="https://github.com/npy0/nanopy",
     license="MIT",

diff --git a/travis.py b/travis.py
@@ -1,4 +1,4 @@
-import os
+import os, timeit
 import nanopy as npy
 from nanopy.rpc import RPC
 
@@ -9,11 +9,14 @@
 assert 0.125 == npy.to_multiplier("fffffe0000000000")
 assert 8.0 == npy.to_multiplier("fffffff800000000")
 
-h=os.urandom(32).hex()
-w=npy.work_generate(h, multiplier=1/8)
+h = os.urandom(32).hex()
+w = npy.work_generate(h, multiplier=1 / 8)
 print(w)
 print(npy.work_validate(w, h))
-assert npy.work_validate(w, h, multiplier=1/8)
+assert npy.work_validate(w, h, multiplier=1 / 8)
+
+# n = 20
+# print(timeit.timeit("npy.work_generate('0feb848ce9637cbc3b41e0334ecef8cf76350f689604a85bae5a2768891ac6e9', multiplier=1/8)",    setup="import nanopy as npy", number=n,)/n)
 
 # https://docs.nano.org/integration-guides/key-management/