chore: fpgemm fix

joda01 · Feb 3, 2025 · 200d9ab · 200d9ab
1 parent 82f1771
commit 200d9ab
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 34 deletions.
diff --git a/.github/workflows/update-cache.yml b/.github/workflows/update-cache.yml
@@ -67,7 +67,7 @@ jobs:
           sudo conan upload openmp/system -r=imageclibs
 
       - name: Add fbgemm 0.8.0
-        if: false
+        if: true
         run: |
           sudo conan export -r=imageclibs --version=0.8.0 recipes/fbgemm/all
           sudo conan upload fbgemm/0.8.0 -r=imageclibs

diff --git a/conanfile.py b/conanfile.py
@@ -14,26 +14,28 @@ class ImageC(ConanFile):
     exports_sources = "src/*"
 
     def requirements(self):
-        self.requires("qt/6.7.1")
-        self.requires("opencv/4.10.0")
-        self.requires("catch2/3.7.0")
-        self.requires("pugixml/1.14")
-        self.requires("nlohmann_json/3.11.3")
-        self.requires("libxlsxwriter/1.1.8")
-        self.requires("duckdb/1.1.0")
-        self.requires("onnx/1.17.0", force=True)
-        self.requires("rapidyaml/0.7.1")
-        self.requires("tensorflow-lite/2.15.0")
-        self.requires("onnxruntime/1.18.1")
-        self.requires("libtorch/2.4.0") # Not supported for MinGW    
-        self.requires("flatbuffers/23.5.26", override=True)
-        self.requires("protobuf/3.21.12", override=True)
-        self.requires("xkbcommon/1.6.0", override=True)
-        self.requires("libpq/15.5", override=True)
-        self.requires("abseil/20240116.1", override=True)
-        self.requires("libbacktrace/cci.20240730", override = True)
-        self.requires("xnnpack/cci.20240229", override = True)
-        self.requires("boost/1.86.0", override = True)
+        self.requires("fbgemm/0.8.0")
+
+        #self.requires("qt/6.7.1")
+        #self.requires("opencv/4.10.0")
+        #self.requires("catch2/3.7.0")
+        #self.requires("pugixml/1.14")
+        #self.requires("nlohmann_json/3.11.3")
+        #self.requires("libxlsxwriter/1.1.8")
+        #self.requires("duckdb/1.1.0")
+        #self.requires("onnx/1.17.0", force=True)
+        #self.requires("rapidyaml/0.7.1")
+        #self.requires("tensorflow-lite/2.15.0")
+        #self.requires("onnxruntime/1.18.1")
+        #self.requires("libtorch/2.4.0") # Not supported for MinGW    
+        #self.requires("flatbuffers/23.5.26", override=True)
+        #self.requires("protobuf/3.21.12", override=True)
+        #self.requires("xkbcommon/1.6.0", override=True)
+        #self.requires("libpq/15.5", override=True)
+        #self.requires("abseil/20240116.1", override=True)
+        #self.requires("libbacktrace/cci.20240730", override = True)
+        #self.requires("xnnpack/cci.20240229", override = True)
+        #self.requires("boost/1.86.0", override = True)
 
 
 

diff --git a/recipes/fbgemm/all/patches/0001-use-conan-dependencies.patch b/recipes/fbgemm/all/patches/0001-use-conan-dependencies.patch
@@ -1,14 +1,5 @@
-From 56c5b860a6c34cf229b30a9f86098695d98e32f1 Mon Sep 17 00:00:00 2001
-From: Martin Valgur <martin.valgur@gmail.com>
-Date: Sun, 28 Jul 2024 21:23:42 +0300
-Subject: [PATCH 1/2] use conan dependencies
-
----
- CMakeLists.txt | 11 ++---------
- 1 file changed, 2 insertions(+), 9 deletions(-)
-
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 35f0a967..b258c442 100644
+index 3f8fd26..5f50e4c 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -246,7 +246,7 @@ message(WARNING "CMAKE_CXX_FLAGS_DEBUG is ${CMAKE_CXX_FLAGS_DEBUG}")
@@ -43,6 +34,11 @@ index 35f0a967..b258c442 100644
  if(OpenMP_FOUND)
    target_link_libraries(fbgemm OpenMP::OpenMP_CXX)
  endif()
--- 
-2.43.0
-
+@@ -397,7 +390,6 @@ if(MSVC)
+       DESTINATION ${CMAKE_INSTALL_LIBDIR} OPTIONAL)
+   endif()
+   install(TARGETS fbgemm DESTINATION ${CMAKE_INSTALL_LIBDIR})
+-  install(TARGETS asmjit DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ endif()
+
+ #Make project importable from the build directory