diff --git a/projects/rccl-tests/LICENSE.txt b/projects/rccl-tests/LICENSE.txt index 4573c07c44..d2e566e3e2 100644 --- a/projects/rccl-tests/LICENSE.txt +++ b/projects/rccl-tests/LICENSE.txt @@ -1,5 +1,6 @@ Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. + Modifications Copyright (c) 2019 Advanced Micro Devices, Inc. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/projects/rccl-tests/Makefile b/projects/rccl-tests/Makefile index 29409a8422..6a90587888 100644 --- a/projects/rccl-tests/Makefile +++ b/projects/rccl-tests/Makefile @@ -1,5 +1,6 @@ # # Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved. +# Modifications are Copyright (c) 2019 Advanced Micro Devices, Inc. All rights reserved. # # See LICENCE.txt for license information # diff --git a/projects/rccl-tests/README.md b/projects/rccl-tests/README.md index 13292fb93b..e96ce21599 100644 --- a/projects/rccl-tests/README.md +++ b/projects/rccl-tests/README.md @@ -66,5 +66,7 @@ All tests support the same set of arguments : ## Copyright -RCCL tests are provided under the BSD license. All source code and accompanying documentation is copyright (c) 2016-2019, NVIDIA CORPORATION. All rights reserved. +RCCL tests are provided under the BSD license. +All source code and accompanying documentation is copyright (c) 2016-2019, NVIDIA CORPORATION. All rights reserved. +All modifications are copyright (c) 2019 Advanced Micro Devices, Inc. All rights reserved. diff --git a/projects/rccl-tests/src/Makefile b/projects/rccl-tests/src/Makefile index bb18157045..56d52405bb 100644 --- a/projects/rccl-tests/src/Makefile +++ b/projects/rccl-tests/src/Makefile @@ -1,5 +1,6 @@ # # Copyright (c) 2015-2019, NVIDIA CORPORATION. All rights reserved. +# Modifications are Copyright (c) 2019 Advanced Micro Devices, Inc. All rights reserved. # # See LICENSE.txt for license information # diff --git a/projects/rccl-tests/src/all_gather.cu b/projects/rccl-tests/src/all_gather.cu index e9d382cd69..45615ccd27 100644 --- a/projects/rccl-tests/src/all_gather.cu +++ b/projects/rccl-tests/src/all_gather.cu @@ -1,5 +1,6 @@ /************************************************************************* * Copyright (c) 2016-2019, NVIDIA CORPORATION. All rights reserved. + * Modifications Copyright (c) 2019 Advanced Micro Devices, Inc. All rights reserved. * * See LICENSE.txt for license information ************************************************************************/ diff --git a/projects/rccl-tests/src/all_reduce.cu b/projects/rccl-tests/src/all_reduce.cu index 4fcb9a0e48..177674085e 100644 --- a/projects/rccl-tests/src/all_reduce.cu +++ b/projects/rccl-tests/src/all_reduce.cu @@ -1,5 +1,6 @@ /************************************************************************* * Copyright (c) 2016-2019, NVIDIA CORPORATION. All rights reserved. + * Modifications Copyright (c) 2019 Advanced Micro Devices, Inc. All rights reserved. * * See LICENSE.txt for license information ************************************************************************/ diff --git a/projects/rccl-tests/src/broadcast.cu b/projects/rccl-tests/src/broadcast.cu index 4a7cdb9ae2..4119d9eefb 100644 --- a/projects/rccl-tests/src/broadcast.cu +++ b/projects/rccl-tests/src/broadcast.cu @@ -1,5 +1,6 @@ /************************************************************************* * Copyright (c) 2015-2016, NVIDIA CORPORATION. All rights reserved. + * Modifications Copyright (c) 2019 Advanced Micro Devices, Inc. All rights reserved. * * See LICENSE.txt for license information ************************************************************************/ diff --git a/projects/rccl-tests/src/common.cu b/projects/rccl-tests/src/common.cu index 9fe70e5986..cd2974189f 100644 --- a/projects/rccl-tests/src/common.cu +++ b/projects/rccl-tests/src/common.cu @@ -1,10 +1,12 @@ -#include "hip/hip_runtime.h" + /************************************************************************* * Copyright (c) 2016-2019, NVIDIA CORPORATION. All rights reserved. + * Modifications Copyright (c) 2019 Advanced Micro Devices, Inc. All rights reserved. * * See LICENSE.txt for license information ************************************************************************/ +#include "hip/hip_runtime.h" #include "common.h" #include #include diff --git a/projects/rccl-tests/src/common.h b/projects/rccl-tests/src/common.h index be4000dd64..2ddf40b2ee 100644 --- a/projects/rccl-tests/src/common.h +++ b/projects/rccl-tests/src/common.h @@ -1,5 +1,6 @@ /************************************************************************* * Copyright (c) 2016-2019, NVIDIA CORPORATION. All rights reserved. + * Modifications Copyright (c) 2019 Advanced Micro Devices, Inc. All rights reserved. * * See LICENSE.txt for license information ************************************************************************/ @@ -192,7 +193,7 @@ static size_t wordSize(ncclDataType_t type) { case ncclInt64: case ncclUint64: case ncclDouble: - //case ncclFloat64: + //case ncclFloat64: return 8; default: return 0; } diff --git a/projects/rccl-tests/src/nccl1_compat.h b/projects/rccl-tests/src/nccl1_compat.h index 726669c885..3c241d3d14 100644 --- a/projects/rccl-tests/src/nccl1_compat.h +++ b/projects/rccl-tests/src/nccl1_compat.h @@ -1,5 +1,6 @@ /************************************************************************* * Copyright (c) 2017-2019, NVIDIA CORPORATION. All rights reserved. + * Modifications Copyright (c) 2019 Advanced Micro Devices, Inc. All rights reserved. * * See LICENSE.txt for license information ************************************************************************/ diff --git a/projects/rccl-tests/src/reduce.cu b/projects/rccl-tests/src/reduce.cu index 5a286c1b6b..3e9056ad05 100644 --- a/projects/rccl-tests/src/reduce.cu +++ b/projects/rccl-tests/src/reduce.cu @@ -1,5 +1,6 @@ /************************************************************************* * Copyright (c) 2016-2019, NVIDIA CORPORATION. All rights reserved. + * Modifications Copyright (c) 2019 Advanced Micro Devices, Inc. All rights reserved. * * See LICENSE.txt for license information ************************************************************************/ diff --git a/projects/rccl-tests/src/reduce_scatter.cu b/projects/rccl-tests/src/reduce_scatter.cu index 3906621e96..c466ca284b 100644 --- a/projects/rccl-tests/src/reduce_scatter.cu +++ b/projects/rccl-tests/src/reduce_scatter.cu @@ -1,5 +1,6 @@ /************************************************************************* * Copyright (c) 2016-2019, NVIDIA CORPORATION. All rights reserved. + * Modifications Copyright (c) 2019 Advanced Micro Devices, Inc. All rights reserved. * * See LICENSE.txt for license information ************************************************************************/