New POW calculation module

.travis.yml

@@ -11,3 +11,4 @@ install:
 script:
   - python checkdeps.py
   - pybitmessage -t
+  - python setup.py test

checkdeps.py

@@ -88,25 +88,7 @@ def testCompiler():
         # silent, we can't test without setuptools
         return True
 
-    bitmsghash = Extension(
-        'bitmsghash',
-        sources=['src/bitmsghash/bitmsghash.cpp'],
-        libraries=['pthread', 'crypto'],
-    )
-
-    dist = Distribution()
-    dist.ext_modules = [bitmsghash]
-    cmd = build_ext(dist)
-    cmd.initialize_options()
-    cmd.finalize_options()
-    cmd.force = True
-    try:
-        cmd.run()
-    except CompileError:
-        return False
-    else:
-        fullPath = os.path.join(cmd.build_lib, cmd.get_ext_filename("bitmsghash"))
-        return os.path.isfile(fullPath)
+    return True
 
 
 prereqs = detectPrereqs()

packages/pyinstaller/bitmessagemain.spec

@@ -52,8 +52,8 @@ else:
 	arch=64
 
 a.binaries += [('libeay32.dll', openSSLPath + 'libeay32.dll', 'BINARY'),
-	(os.path.join('bitmsghash', 'bitmsghash%i.dll' % (arch)), os.path.join(srcPath, 'bitmsghash', 'bitmsghash%i.dll' % (arch)), 'BINARY'),
-	(os.path.join('bitmsghash', 'bitmsghash.cl'), os.path.join(srcPath, 'bitmsghash', 'bitmsghash.cl'), 'BINARY'),
+	("workprover/fastsolver/libfastsolver-{}.dll".format(arch), os.path.join(srcPath, "workprover/fastsolver/libfastsolver-{}.dll".format(arch)), "BINARY"),
+	("workprover/gpusolver.cl", os.path.join(srcPath, "workprover/gpusolver.cl"), "BINARY"),
 	(os.path.join('sslkeys', 'cert.pem'), os.path.join(srcPath, 'sslkeys', 'cert.pem'), 'BINARY'),
 	(os.path.join('sslkeys', 'key.pem'), os.path.join(srcPath, 'sslkeys', 'key.pem'), 'BINARY')
 	]

setup.py

@@ -12,7 +12,7 @@
 EXTRAS_REQUIRE = {
     'gir': ['pygobject'],
     'notify2': ['notify2'],
-    'pyopencl': ['pyopencl'],
+    'pyopencl': ['pyopencl', 'numpy'],
     'prctl': ['python_prctl'],  # Named threads
     'qrcode': ['qrcode'],
     'sound;platform_system=="Windows"': ['winsound'],
@@ -50,12 +50,6 @@ def run(self):
     with open(os.path.join(here, 'README.md')) as f:
         README = f.read()
 
-    bitmsghash = Extension(
-        'pybitmessage.bitmsghash.bitmsghash',
-        sources=['src/bitmsghash/bitmsghash.cpp'],
-        libraries=['pthread', 'crypto'],
-    )
-
     installRequires = []
     packages = [
         'pybitmessage',
@@ -66,7 +60,8 @@ def run(self):
         'pybitmessage.pyelliptic',
         'pybitmessage.socks',
         'pybitmessage.storage',
-        'pybitmessage.plugins'
+        'pybitmessage.plugins',
+        'pybitmessage.workprover'
     ]
 
     # this will silently accept alternative providers of msgpack
@@ -108,8 +103,9 @@ def run(self):
         package_dir={'pybitmessage': 'src'},
         packages=packages,
         package_data={'': [
-            'bitmessageqt/*.ui', 'bitmsghash/*.cl', 'sslkeys/*.pem',
-            'translations/*.ts', 'translations/*.qm',
+            'bitmessageqt/*.ui', 'translations/*.ts', 'translations/*.qm',
+            'workprover/*.cl', 'workprover/fastsolver/*',
+            'sslkeys/*.pem',
             'images/*.png', 'images/*.ico', 'images/*.icns'
         ]},
         data_files=[
@@ -120,7 +116,6 @@ def run(self):
             ('share/icons/hicolor/24x24/apps/',
                 ['desktop/icons/24x24/pybitmessage.png'])
         ],
-        ext_modules=[bitmsghash],
         zip_safe=False,
         entry_points={
             'bitmessage.gui.menu': [