Skip to content

Commit e66de13

Browse files
malfetmalfet
committed
[CMake] Use libtorch_cuda list defined in bzl file
Since NCCL is an optional CUDA dependency, remove nccl.cpp from the core filelist
1 parent f4e15c4 commit e66de13

2 files changed

Lines changed: 6 additions & 55 deletions

File tree

‎caffe2/CMakeLists.txt‎

Lines changed: 1 addition & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -515,59 +515,7 @@ if(NOT INTERN_BUILD_MOBILE OR NOT BUILD_CAFFE2_MOBILE)
515515
endif()
516516

517517
if(USE_CUDA OR USE_ROCM)
518-
list(APPEND Caffe2_GPU_HIP_JIT_FUSERS_SRCS
519-
${TORCH_SRC_DIR}/csrc/jit/codegen/fuser/cuda/fused_kernel.cpp
520-
${TORCH_SRC_DIR}/csrc/autograd/profiler_cuda.cpp
521-
${TORCH_SRC_DIR}/csrc/autograd/functions/comm.cpp
522-
${TORCH_SRC_DIR}/csrc/cuda/comm.cpp
523-
${TORCH_SRC_DIR}/csrc/jit/codegen/cuda/arith.cpp
524-
${TORCH_SRC_DIR}/csrc/jit/codegen/cuda/compute_at.cpp
525-
${TORCH_SRC_DIR}/csrc/jit/codegen/cuda/codegen.cpp
526-
${TORCH_SRC_DIR}/csrc/jit/codegen/cuda/dispatch.cpp
527-
${TORCH_SRC_DIR}/csrc/jit/codegen/cuda/expr_evaluator.cpp
528-
${TORCH_SRC_DIR}/csrc/jit/codegen/cuda/executor.cpp
529-
${TORCH_SRC_DIR}/csrc/jit/codegen/cuda/executor_kernel_arg.cpp
530-
${TORCH_SRC_DIR}/csrc/jit/codegen/cuda/executor_launch_params.cpp
531-
${TORCH_SRC_DIR}/csrc/jit/codegen/cuda/executor_utils.cpp
532-
${TORCH_SRC_DIR}/csrc/jit/codegen/cuda/fusion.cpp
533-
${TORCH_SRC_DIR}/csrc/jit/codegen/cuda/graph_fuser.cpp
534-
${TORCH_SRC_DIR}/csrc/jit/codegen/cuda/index_compute.cpp
535-
${TORCH_SRC_DIR}/csrc/jit/codegen/cuda/instrumentation.cpp
536-
${TORCH_SRC_DIR}/csrc/jit/codegen/cuda/ir_base_nodes.cpp
537-
${TORCH_SRC_DIR}/csrc/jit/codegen/cuda/ir_cloner.cpp
538-
${TORCH_SRC_DIR}/csrc/jit/codegen/cuda/ir_graphviz.cpp
539-
${TORCH_SRC_DIR}/csrc/jit/codegen/cuda/ir_nodes.cpp
540-
${TORCH_SRC_DIR}/csrc/jit/codegen/cuda/ir_iostream.cpp
541-
${TORCH_SRC_DIR}/csrc/jit/codegen/cuda/iter_visitor.cpp
542-
${TORCH_SRC_DIR}/csrc/jit/codegen/cuda/kernel.cpp
543-
${TORCH_SRC_DIR}/csrc/jit/codegen/cuda/kernel_cache.cpp
544-
${TORCH_SRC_DIR}/csrc/jit/codegen/cuda/kernel_ir.cpp
545-
${TORCH_SRC_DIR}/csrc/jit/codegen/cuda/kernel_ir_builder.cpp
546-
${TORCH_SRC_DIR}/csrc/jit/codegen/cuda/kernel_ir_printer.cpp
547-
${TORCH_SRC_DIR}/csrc/jit/codegen/cuda/lower_index.cpp
548-
${TORCH_SRC_DIR}/csrc/jit/codegen/cuda/lower_alias_memory.cpp
549-
${TORCH_SRC_DIR}/csrc/jit/codegen/cuda/lower_insert_syncs.cpp
550-
${TORCH_SRC_DIR}/csrc/jit/codegen/cuda/lower_loops.cpp
551-
${TORCH_SRC_DIR}/csrc/jit/codegen/cuda/lower_thread_predicate.cpp
552-
${TORCH_SRC_DIR}/csrc/jit/codegen/cuda/lower_unroll.cpp
553-
${TORCH_SRC_DIR}/csrc/jit/codegen/cuda/lower_utils.cpp
554-
${TORCH_SRC_DIR}/csrc/jit/codegen/cuda/lower_validation.cpp
555-
${TORCH_SRC_DIR}/csrc/jit/codegen/cuda/lower2device.cpp
556-
${TORCH_SRC_DIR}/csrc/jit/codegen/cuda/manager.cpp
557-
${TORCH_SRC_DIR}/csrc/jit/codegen/cuda/mutator.cpp
558-
${TORCH_SRC_DIR}/csrc/jit/codegen/cuda/parser.cpp
559-
${TORCH_SRC_DIR}/csrc/jit/codegen/cuda/partition.cpp
560-
${TORCH_SRC_DIR}/csrc/jit/codegen/cuda/predicate_compute.cpp
561-
${TORCH_SRC_DIR}/csrc/jit/codegen/cuda/register_interface.cpp
562-
${TORCH_SRC_DIR}/csrc/jit/codegen/cuda/scheduler.cpp
563-
${TORCH_SRC_DIR}/csrc/jit/codegen/cuda/shape_inference.cpp
564-
${TORCH_SRC_DIR}/csrc/jit/codegen/cuda/tensor_view.cpp
565-
${TORCH_SRC_DIR}/csrc/jit/codegen/cuda/transform_iter.cpp
566-
${TORCH_SRC_DIR}/csrc/jit/codegen/cuda/transform_replay.cpp
567-
${TORCH_SRC_DIR}/csrc/jit/codegen/cuda/transform_rfactor.cpp
568-
${TORCH_SRC_DIR}/csrc/jit/codegen/cuda/type.cpp
569-
${TORCH_SRC_DIR}/csrc/jit/tensorexpr/cuda_codegen.cpp
570-
)
518+
append_filelist("libtorch_cuda_core_sources" Caffe2_GPU_HIP_JIT_FUSERS_SRCS)
571519
endif()
572520

573521
if(USE_CUDA)

‎tools/build_variables.bzl‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -353,9 +353,8 @@ libtorch_extra_sources = libtorch_core_jit_sources + [
353353
def libtorch_sources(gencode_pattern = ":generate-code[{}]"):
354354
return libtorch_generated_sources(gencode_pattern) + libtorch_core_sources + libtorch_distributed_sources + libtorch_extra_sources
355355

356-
libtorch_cuda_sources = [
356+
libtorch_cuda_core_sources = [
357357
"torch/csrc/cuda/comm.cpp",
358-
"torch/csrc/cuda/nccl.cpp",
359358
"torch/csrc/jit/codegen/fuser/cuda/fused_kernel.cpp",
360359
"torch/csrc/autograd/profiler_cuda.cpp",
361360
"torch/csrc/autograd/functions/comm.cpp",
@@ -408,6 +407,10 @@ libtorch_cuda_sources = [
408407
"torch/csrc/jit/tensorexpr/cuda_codegen.cpp",
409408
]
410409

410+
libtorch_cuda_sources = libtorch_cuda_core_sources + [
411+
"torch/csrc/cuda/nccl.cpp",
412+
]
413+
411414
torch_cpp_srcs = [
412415
"torch/csrc/api/src/cuda.cpp", # this just forwards stuff, no real CUDA
413416
"torch/csrc/api/src/data/datasets/mnist.cpp",

0 commit comments

Comments
 (0)