Update fbgemm pinned version (#153072)

gchalump · facebook-github-bot · commit 3bea96d23e48 · 2025-05-16T15:48:47.000-07:00
Summary: Pull Request resolved: #153072 Update fbgemm pinned version. Related update in fbgemm: D74434751 Included changes: - Update fbgemm external dependencies directory in setup.py Test Plan: PyTorch CI Differential Revision: D74335570
diff --git a/WORKSPACE b/WORKSPACE
@@ -144,8 +144,8 @@ new_local_repository(
 
 new_local_repository(
     name = "asmjit",
-    build_file = "//third_party:fbgemm/third_party/asmjit.BUILD",
-    path = "third_party/fbgemm/third_party/asmjit",
+    build_file = "//third_party:fbgemm/external/asmjit.BUILD",
+    path = "third_party/fbgemm/external/asmjit",
 )
 
 new_local_repository(
diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
@@ -682,6 +682,10 @@ if(USE_FBGEMM)
     set_property(TARGET fbgemm_avx2 PROPERTY POSITION_INDEPENDENT_CODE ON)
     set_property(TARGET fbgemm_avx512 PROPERTY POSITION_INDEPENDENT_CODE ON)
     set_property(TARGET fbgemm PROPERTY POSITION_INDEPENDENT_CODE ON)
+    target_compile_definitions(fbgemm_generic PUBLIC DISABLE_FBGEMM_AUTOVEC)
+    target_compile_definitions(fbgemm_avx2 PUBLIC DISABLE_FBGEMM_AUTOVEC)
+    target_compile_definitions(fbgemm_avx512 PUBLIC DISABLE_FBGEMM_AUTOVEC)
+
     # TODO: Remove next two lines after fbgemm pin is updated
 
     # For more details see https://github.com/pytorch/pytorch/issues/150846
@@ -698,7 +702,7 @@ if(USE_FBGEMM)
       target_compile_options_if_supported(fbgemm -Wno-extra-semi)
     endif()
   endif()
-
+  target_compile_definitions(fbgemm PUBLIC DISABLE_FBGEMM_AUTOVEC)
   if(USE_FBGEMM)
     list(APPEND Caffe2_DEPENDENCY_LIBS fbgemm)
   endif()
diff --git a/setup.py b/setup.py
@@ -443,7 +443,7 @@ def not_exists_or_empty(folder):
             ],
         )
     check_for_files(
-        os.path.join(third_party_path, "fbgemm", "third_party", "asmjit"),
+        os.path.join(third_party_path, "fbgemm", "external", "asmjit"),
         ["CMakeLists.txt"],
     )
 
diff --git a/third_party/fbgemm b/third_party/fbgemm
@@ -1 +1 @@
-Subproject commit dbc3157bf256f1339b3fa1fef2be89ac4078be0e
+Subproject commit 0682a6cc02ddbaf3265776e2b590457657540a2b

Original file line number	Diff line number	Diff line change
`@@ -144,8 +144,8 @@ new_local_repository(`
`144`	`144`
`145`	`145`	`new_local_repository(`
`146`	`146`	`name = "asmjit",`
`147`		`- build_file = "//third_party:fbgemm/third_party/asmjit.BUILD",`
`148`		`- path = "third_party/fbgemm/third_party/asmjit",`
	`147`	`+ build_file = "//third_party:fbgemm/external/asmjit.BUILD",`
	`148`	`+ path = "third_party/fbgemm/external/asmjit",`
`149`	`149`	`)`
`150`	`150`
`151`	`151`	`new_local_repository(`
Original file line number	Diff line number	Diff line change
`@@ -443,7 +443,7 @@ def not_exists_or_empty(folder):`
`443`	`443`	`],`
`444`	`444`	`)`
`445`	`445`	`check_for_files(`
`446`		`- os.path.join(third_party_path, "fbgemm", "third_party", "asmjit"),`
	`446`	`+ os.path.join(third_party_path, "fbgemm", "external", "asmjit"),`
`447`	`447`	`["CMakeLists.txt"],`
`448`	`448`	`)`
`449`	`449`