Skip to content

Commit 553056d

Browse files
bwbarrettbwbarrett
authored
Merge pull request open-mpi#10183 from bwbarrett/bugfix/cuda-dependency-graph
cuda: move common/cuda into libopen-pal
2 parents 24473c5 + 58cdac1 commit 553056d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+158
-232
lines changed

‎config/opal_config_files.m4‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
# Copyright (c) 2020 The University of Tennessee and The University
55
# of Tennessee Research Foundation. All rights
66
# reserved.
7+
# Copyright (c) 2022 Amazon.com, Inc. or its affiliates. All Rights reserved.
78
# $COPYRIGHT$
89
#
910
# Additional copyrights may follow
@@ -16,6 +17,7 @@
1617
AC_DEFUN([OPAL_CONFIG_FILES],[
1718
AC_CONFIG_FILES([
1819
opal/Makefile
20+
opal/cuda/Makefile
1921
opal/etc/Makefile
2022
opal/include/Makefile
2123
opal/datatype/Makefile

‎ompi/mca/coll/cuda/coll_cuda_allreduce.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* of Tennessee Research Foundation. All rights
44
* reserved.
55
* Copyright (c) 2014-2015 NVIDIA Corporation. All rights reserved.
6+
* Copyright (c) 2022 Amazon.com, Inc. or its affiliates. All Rights reserved.
67
* $COPYRIGHT$
78
*
89
* Additional copyrights may follow
@@ -17,7 +18,7 @@
1718

1819
#include "ompi/op/op.h"
1920
#include "opal/datatype/opal_convertor.h"
20-
#include "opal/mca/common/cuda/common_cuda.h"
21+
#include "opal/cuda/common_cuda.h"
2122

2223
/*
2324
* allreduce_intra

‎ompi/mca/coll/cuda/coll_cuda_exscan.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* of Tennessee Research Foundation. All rights
44
* reserved.
55
* Copyright (c) 2014-2015 NVIDIA Corporation. All rights reserved.
6+
* Copyright (c) 2022 Amazon.com, Inc. or its affiliates. All Rights reserved.
67
* $COPYRIGHT$
78
*
89
* Additional copyrights may follow
@@ -17,7 +18,7 @@
1718

1819
#include "ompi/op/op.h"
1920
#include "opal/datatype/opal_convertor.h"
20-
#include "opal/mca/common/cuda/common_cuda.h"
21+
#include "opal/cuda/common_cuda.h"
2122

2223
int mca_coll_cuda_exscan(const void *sbuf, void *rbuf, int count,
2324
struct ompi_datatype_t *dtype,

‎ompi/mca/coll/cuda/coll_cuda_reduce.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* of Tennessee Research Foundation. All rights
44
* reserved.
55
* Copyright (c) 2014-2015 NVIDIA Corporation. All rights reserved.
6+
* Copyright (c) 2022 Amazon.com, Inc. or its affiliates. All Rights reserved.
67
* $COPYRIGHT$
78
*
89
* Additional copyrights may follow
@@ -17,7 +18,7 @@
1718

1819
#include "ompi/op/op.h"
1920
#include "opal/datatype/opal_convertor.h"
20-
#include "opal/mca/common/cuda/common_cuda.h"
21+
#include "opal/cuda/common_cuda.h"
2122

2223
/*
2324
* reduce_log_inter

‎ompi/mca/coll/cuda/coll_cuda_reduce_scatter_block.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* of Tennessee Research Foundation. All rights
44
* reserved.
55
* Copyright (c) 2014-2015 NVIDIA Corporation. All rights reserved.
6+
* Copyright (c) 2022 Amazon.com, Inc. or its affiliates. All Rights reserved.
67
* $COPYRIGHT$
78
*
89
* Additional copyrights may follow
@@ -17,7 +18,7 @@
1718

1819
#include "ompi/op/op.h"
1920
#include "opal/datatype/opal_convertor.h"
20-
#include "opal/mca/common/cuda/common_cuda.h"
21+
#include "opal/cuda/common_cuda.h"
2122

2223
/*
2324
* reduce_scatter_block

‎ompi/mca/coll/cuda/coll_cuda_scan.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* of Tennessee Research Foundation. All rights
44
* reserved.
55
* Copyright (c) 2014-2015 NVIDIA Corporation. All rights reserved.
6+
* Copyright (c) 2022 Amazon.com, Inc. or its affiliates. All Rights reserved.
67
* $COPYRIGHT$
78
*
89
* Additional copyrights may follow
@@ -17,7 +18,7 @@
1718

1819
#include "ompi/op/op.h"
1920
#include "opal/datatype/opal_convertor.h"
20-
#include "opal/mca/common/cuda/common_cuda.h"
21+
#include "opal/cuda/common_cuda.h"
2122

2223
/*
2324
* scan

‎ompi/mca/coll/libnbc/nbc_internal.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
* reserved.
1717
* Copyright (c) 2018 FUJITSU LIMITED. All rights reserved.
1818
* Copyright (c) 2021 IBM Corporation. All rights reserved.
19+
* Copyright (c) 2022 Amazon.com, Inc. or its affiliates. All Rights reserved.
1920
* $COPYRIGHT$
2021
*
2122
* Additional copyrights may follow
@@ -32,7 +33,7 @@
3233
#include "coll_libnbc.h"
3334
#if OPAL_CUDA_SUPPORT
3435
#include "opal/datatype/opal_convertor.h"
35-
#include "opal/mca/common/cuda/common_cuda.h"
36+
#include "opal/cuda/common_cuda.h"
3637
#endif /* OPAL_CUDA_SUPPORT */
3738
#include "ompi/include/ompi/constants.h"
3839
#include "ompi/request/request.h"

‎ompi/mca/common/ompio/common_ompio_buffer.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
* Copyright (c) 2004-2005 The Regents of the University of California.
1111
* All rights reserved.
1212
* Copyright (c) 2008-2019 University of Houston. All rights reserved.
13+
* Copyright (c) 2022 Amazon.com, Inc. or its affiliates. All Rights reserved.
1314
* $COPYRIGHT$
1415
*
1516
* Additional copyrights may follow
@@ -20,7 +21,7 @@
2021
#include "ompi_config.h"
2122

2223
#include "opal/datatype/opal_convertor.h"
23-
#include "opal/mca/common/cuda/common_cuda.h"
24+
#include "opal/cuda/common_cuda.h"
2425
#include "opal/util/sys_limits.h"
2526

2627
#include "opal/mca/allocator/allocator.h"

‎ompi/mca/mtl/base/mtl_base_datatype.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
* University of Stuttgart. All rights reserved.
1010
* Copyright (c) 2004-2006 The Regents of the University of California.
1111
* All rights reserved.
12+
* Copyright (c) 2022 Amazon.com, Inc. or its affiliates. All Rights reserved.
1213
* $COPYRIGHT$
1314
*
1415
* Additional copyrights may follow
@@ -26,7 +27,7 @@
2627
#include "opal/datatype/opal_convertor.h"
2728
#include "opal/datatype/opal_datatype_internal.h"
2829
#if OPAL_CUDA_SUPPORT
29-
#include "opal/mca/common/cuda/common_cuda.h"
30+
#include "opal/cuda/common_cuda.h"
3031
#include "opal/datatype/opal_convertor.h"
3132
#endif
3233

‎ompi/mca/mtl/ofi/mtl_ofi.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* reserved.
55
* Copyright (c) 2019-2021 Triad National Security, LLC. All rights
66
* reserved.
7-
* Copyright (c) 2018-2020 Amazon.com, Inc. or its affiliates. All rights
7+
* Copyright (c) 2018-2022 Amazon.com, Inc. or its affiliates. All Rights reserved.
88
* reserved.
99
* Copyright (c) 2021 Cisco Systems, Inc. All rights reserved
1010
* Copyright (c) 2021 The University of Tennessee and The University
@@ -51,7 +51,7 @@
5151
#include "mtl_ofi_compat.h"
5252

5353
#if OPAL_CUDA_SUPPORT
54-
#include "opal/mca/common/cuda/common_cuda.h"
54+
#include "opal/cuda/common_cuda.h"
5555
#include "opal/datatype/opal_convertor.h"
5656
#endif
5757

0 commit comments

Comments
 (0)