Merge branch 'master' into sharp-oob

openucx · Mar 13, 2023 · b6ebc8a · b6ebc8a
2 parents 0f1fd69 + 1cdc03d
commit b6ebc8a
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 3 deletions.
diff --git a/src/core/ucc_lib.h b/src/core/ucc_lib.h
@@ -36,9 +36,6 @@ typedef struct ucc_lib_info {
     ucc_cl_lib_attr_t *cl_attrs;
 } ucc_lib_info_t;
 
-void ucc_get_version(unsigned *major_version, unsigned *minor_version,
-                     unsigned *release_number);
-
 int ucc_tl_is_required(ucc_lib_info_t *lib, ucc_tl_iface_t *tl_iface,
                        int forced);
 #endif
diff --git a/src/ucc/api/ucc.h b/src/ucc/api/ucc.h
@@ -704,6 +704,27 @@ void ucc_lib_config_print(const ucc_lib_config_h config, FILE *stream,
 ucc_status_t ucc_lib_config_modify(ucc_lib_config_h config, const char *name,
                                    const char *value);
 
+/**
+ * @ingroup UCC_LIB
+ * @brief Get UCC library version.
+ *
+ * This routine returns the UCC library version.
+ *
+ * @param [out] major_version       Filled with library major version.
+ * @param [out] minor_version       Filled with library minor version.
+ * @param [out] release_number      Filled with library release number.
+ */
+void ucc_get_version(unsigned *major_version, unsigned *minor_version,
+                     unsigned *release_number);
+
+/**
+ * @ingroup UCC_LIB
+ * @brief Get UCC library version as a string.
+ *
+ * This routine returns the UCC library version as a string which consists of:
+ * "major.minor.release".
+ */
+const char *ucc_get_version_string(void);
 
 /**
  * @ingroup UCC_LIB

diff --git a/test/mpi/main.cc b/test/mpi/main.cc
@@ -1,3 +1,10 @@
+/**
+ * Copyright (c) 2021, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. 2023. ALL RIGHTS RESERVED.
+ *
+ * See file LICENSE for terms.
+ */
+
 #include <getopt.h>
 #include <sstream>
 #include "test_mpi.h"
@@ -626,6 +633,12 @@ int main(int argc, char *argv[])
             "   elapsed     : " <<
             std::chrono::duration_cast<std::chrono::seconds>(end - begin).count()
                   << "s" << std::endl;
+
+	if (skipped == test->results.size()) {
+            std::cout << "\n All tests have been skipped, indicating most likely "
+                         "a problem\n";
+            failed = 1;
+	}
     }
 test_exit:
     delete test;