Skip to content

Commit 625f9ce

Browse files
q10facebook-github-bot
authored andcommitted
Reduce OSS build sizes for non-GenAI FBGEMM_GPU (#3948)
Summary: X-link: facebookresearch/FBGEMM#1034 - Remove GenAI build targetfrom the regular FBGEMM_GPU builds, now that we have GenAI-only release packages - Increase the build times on Nova to prevent ROCm build timeouts Pull Request resolved: #3948 Reviewed By: spcyppt Differential Revision: D72730593 Pulled By: q10 fbshipit-source-id: f71709f29c2e769a36b9ec3be2d48ed10a24c32f
1 parent ffcc7da commit 625f9ce

7 files changed

+16
-24
lines changed

.github/scripts/fbgemm_gpu_test.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ __determine_test_directories () {
257257
)
258258
fi
259259

260-
if [ "$fbgemm_gpu_variant" == "cuda" ] || [ "$fbgemm_gpu_variant" == "genai" ]; then
260+
if [ "$fbgemm_gpu_variant" == "genai" ]; then
261261
target_directories+=(
262262
fbgemm_gpu/experimental/example/test
263263
fbgemm_gpu/experimental/gemm/test

.github/workflows/build_wheels_genai_linux_aarch64.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,4 @@ jobs:
6161
trigger-event: ${{ github.event_name }}
6262
architecture: aarch64
6363
setup-miniconda: false
64-
timeout: 210
64+
timeout: 300

.github/workflows/build_wheels_genai_linux_x86.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,4 @@ jobs:
5151
test-infra-ref: main
5252
build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
5353
trigger-event: ${{ github.event_name }}
54-
timeout: 240
54+
timeout: 300

.github/workflows/build_wheels_linux_aarch64.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,4 @@ jobs:
6060
trigger-event: ${{ github.event_name }}
6161
architecture: aarch64
6262
setup-miniconda: false
63-
timeout: 210
63+
timeout: 300

.github/workflows/build_wheels_linux_x86.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,4 @@ jobs:
5050
test-infra-ref: main
5151
build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
5252
trigger-event: ${{ github.event_name }}
53-
timeout: 240
53+
timeout: 300

fbgemm_gpu/CMakeLists.txt

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -237,29 +237,21 @@ endfunction()
237237

238238

239239
################################################################################
240-
# Build FBGEMM_GPU (Main) Module
240+
# Build Targets
241241
################################################################################
242242

243-
if(NOT FBGEMM_GENAI_ONLY)
244-
include(FbgemmGpu.cmake)
245-
endif()
246-
247-
248-
################################################################################
249-
# Build Experimental Modules
250-
################################################################################
243+
if(FBGEMM_GENAI_ONLY)
244+
# Build FBGEMM GenAI
245+
add_subdirectory(experimental/gen_ai)
251246

252-
if(NOT FBGEMM_CPU_ONLY AND NOT USE_ROCM)
247+
# Add experimental packaging example
253248
add_subdirectory(experimental/example)
254-
endif()
255249

256-
if(NOT FBGEMM_CPU_ONLY)
257-
# Package Triton GEMM (GenAI) kernels
250+
# Add Triton GEMM (GenAI) kernels if non-CPU build
258251
add_subdirectory(experimental/gemm)
259-
endif()
260252

261-
if(NOT FBGEMM_CPU_ONLY AND NOT USE_ROCM)
262-
# TODO: Re-enable gen_ai for ROCm once ck/tensor_operation/gpu/device/impl/device_gemm_multiple_d_xdl_cshuffle_v3_ab_scale.hpp
263-
# lands into latest ROCm
264-
add_subdirectory(experimental/gen_ai)
253+
else()
254+
# Build FBGEMM_GPU
255+
include(FbgemmGpu.cmake)
256+
265257
endif()

fbgemm_gpu/fbgemm_gpu/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ def _load_library(filename: str, no_throw: bool = False) -> None:
6969
libraries_to_load = {
7070
"cpu": fbgemm_gpu_libraries,
7171
"docs": fbgemm_gpu_libraries,
72-
"cuda": fbgemm_gpu_libraries + fbgemm_gpu_genai_libraries,
72+
"cuda": fbgemm_gpu_libraries,
7373
"genai": fbgemm_gpu_genai_libraries,
7474
"rocm": fbgemm_gpu_libraries,
7575
}

0 commit comments

Comments
 (0)