opencl multi-gpu fix

madMAx43v3r · Feb 27, 2023 · 4ba5acc · 4ba5acc
1 parent 5deec8c
commit 4ba5acc
Show file tree

Hide file tree

Showing 11 changed files with 6 additions and 6 deletions.
diff --git a/mmx-node/linux/x86_64/bin/mmx_farmer b/mmx-node/linux/x86_64/bin/mmx_farmer
diff --git a/mmx-node/linux/x86_64/bin/mmx_harvester b/mmx-node/linux/x86_64/bin/mmx_harvester
diff --git a/mmx-node/linux/x86_64/bin/mmx_node b/mmx-node/linux/x86_64/bin/mmx_node
diff --git a/mmx-node/linux/x86_64/bin/mmx_timelord b/mmx-node/linux/x86_64/bin/mmx_timelord
diff --git a/mmx-node/linux/x86_64/bin/mmx_wallet b/mmx-node/linux/x86_64/bin/mmx_wallet
diff --git a/mmx-node/linux/x86_64/include/automy/basic_opencl/Context.h b/mmx-node/linux/x86_64/include/automy/basic_opencl/Context.h
@@ -19,6 +19,7 @@
 #define CL_TARGET_OPENCL_VERSION 120
 
 #include <CL/cl.h>
+#include <CL/cl_ext.h>
 
 #include <vector>
 #include <string>
@@ -35,7 +36,7 @@ std::string get_platform_name(cl_platform_id platform);
 
 cl_platform_id find_platform_by_name(const std::string& name);
 
-cl_context create_context(cl_platform_id platform, cl_device_type device_type);
+cl_context create_context(cl_platform_id platform, const std::vector<cl_device_id>& devices);
 
 void release_context(cl_context& context);
 

diff --git a/mmx-node/linux/x86_64/include/automy/basic_opencl/Program.h b/mmx-node/linux/x86_64/include/automy/basic_opencl/Program.h
@@ -25,14 +25,14 @@ class Program {
 
 	std::vector<std::string> build_log;
 
-	Program(cl_context context, cl_platform_id platform);
+	Program(cl_context context);
 
 	Program(const Program&) = delete;
 	Program& operator=(const Program&) = delete;
 
 	~Program();
 
-	static std::shared_ptr<Program> create(cl_context context, cl_platform_id platform);
+	static std::shared_ptr<Program> create(cl_context context);
 
 	void add_source(const std::string& file_name);
 
@@ -42,7 +42,7 @@ class Program {
 
 	void create_from_source();
 
-	bool build(cl_device_type device_type, bool with_arg_names = true);
+	bool build(const std::vector<cl_device_id>& devices, bool with_arg_names = true);
 
 	void print_sources(std::ostream& out) const;
 
@@ -52,7 +52,6 @@ class Program {
 
 private:
 	cl_context context;
-	cl_platform_id platform;
 	cl_program program = nullptr;
 	bool have_arg_info = false;
 

diff --git a/mmx-node/linux/x86_64/lib/libautomy_basic_opencl.so b/mmx-node/linux/x86_64/lib/libautomy_basic_opencl.so
diff --git a/mmx-node/linux/x86_64/lib/libautomy_basic_opencl_static.a b/mmx-node/linux/x86_64/lib/libautomy_basic_opencl_static.a
diff --git a/mmx-node/linux/x86_64/lib/libmmx_modules.so b/mmx-node/linux/x86_64/lib/libmmx_modules.so
diff --git a/mmx-node/linux/x86_64/www/web-gui/public/GIT_COMMIT_HASH.json b/mmx-node/linux/x86_64/www/web-gui/public/GIT_COMMIT_HASH.json
@@ -1 +1 @@
-{ "GIT_COMMIT_HASH": "16939684ebca0ee7085db420c20690606edabb83" }
+{ "GIT_COMMIT_HASH": "8798516448ba980f3fc1ea0293a816206fa4b02b" }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{ "GIT_COMMIT_HASH": "16939684ebca0ee7085db420c20690606edabb83" }
		{ "GIT_COMMIT_HASH": "8798516448ba980f3fc1ea0293a816206fa4b02b" }