[build] OSS build fixes

.github/scripts/utils_build.bash

@@ -14,7 +14,7 @@
 ################################################################################
 
 setup_bazel () {
-  local bazel_version="${1:-6.1.1}"
+  local bazel_version="${1:-8.0.0}"
   echo "################################################################################"
   echo "# Setup Bazel"
   echo "#"
@@ -294,22 +294,29 @@ install_build_tools () {
   #   $CONDA_PREFIX/include directory, which is required for FBGEMM tests
   #
   # - ncurses is needed to silence libtinfo6.so errors for ROCm+Clang builds
+  # - rhash is needed bc newer versions of GXX package don't come packaged with this library anymore
   #
   # shellcheck disable=SC2086
   (exec_with_retries 3 conda install ${env_prefix} -c conda-forge -y \
     bazel \
     click \
-    cmake \
+    'cmake>=3.30' \
     hypothesis \
     jinja2 \
     make \
     ncurses \
     ninja \
     openblas \
     patchelf \
+    rhash \
     scikit-build \
     wheel) || return 1
 
+  echo "[INSTALL] Adding symlink librhash.so.0, which is needed by Cmake ..."
+  # shellcheck disable=SC2155,SC2086
+  local conda_prefix=$(conda run ${env_prefix} printenv CONDA_PREFIX)
+  (print_exec ln -s "${conda_prefix}/lib/librhash.so" "${conda_prefix}/lib/librhash.so.0") || return 1
+
   # For some reason, the build package for Python 3.12 is missing from Conda, so
   # we have to install through PyPI instead.
   #

MODULE.bazel

@@ -5,4 +5,4 @@
 
 module(name = "fbgemm")
 
-bazel_dep(name = "bazel_skylib", version = "1.5.0")
+bazel_dep(name = "bazel_skylib", version = "1.7.1")

WORKSPACE.bazel

@@ -7,6 +7,15 @@ workspace(name = "fbgemm")
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
+http_archive(
+    name = "bazel_skylib",
+    sha256 = "bc283cdfcd526a52c3201279cda4bc298652efa898b10b4db0837dc51652756f",
+    urls = [
+        "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.7.1/bazel-skylib-1.7.1.tar.gz",
+        "https://github.com/bazelbuild/bazel-skylib/releases/download/1.7.1/bazel-skylib-1.7.1.tar.gz",
+    ],
+)
+
 http_archive(
     name = "com_google_googletest",
     strip_prefix = "googletest-1.14.0",
@@ -29,3 +38,6 @@ new_local_repository(
     build_file = "@//external:asmjit.BUILD",
     path = "external/asmjit",
 )
+
+load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
+bazel_skylib_workspace()

bench/CMakeLists.txt

@@ -4,7 +4,7 @@
 # This source code is licensed under the BSD-style license found in the
 # LICENSE file in the root directory of this source tree.
 
-cmake_minimum_required(VERSION 3.16 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.25 FATAL_ERROR)
 
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_EXTENSIONS OFF)

fbgemm_gpu/CMakeLists.txt

@@ -8,7 +8,7 @@
 # CMake Prelude
 ################################################################################
 
-cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.25 FATAL_ERROR)
 
 set(CMAKEMODULES ${CMAKE_CURRENT_SOURCE_DIR}/../cmake/modules)
 set(FBGEMM_GPU ${CMAKE_CURRENT_SOURCE_DIR})

test/CMakeLists.txt

@@ -4,7 +4,7 @@
 # This source code is licensed under the BSD-style license found in the
 # LICENSE file in the root directory of this source tree.
 
-cmake_minimum_required(VERSION 3.21 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.25 FATAL_ERROR)
 
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_EXTENSIONS OFF)