Merge pull request NVIDIA#1076 from NVIDIA/bot-auto-merge-branch-23.04

[auto-merge] bot-auto-merge-branch-23.04 to branch-23.06 [skip ci] [bot]
tgravescs · Apr 13, 2023 · f67efb9 · f67efb9
2 parents 18ec35b + e2382ae
commit f67efb9
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/main/cpp/src/SparkResourceAdaptorJni.cpp b/src/main/cpp/src/SparkResourceAdaptorJni.cpp
@@ -642,7 +642,7 @@ class spark_resource_adaptor final : public rmm::mr::device_memory_resource {
     // In testing it looks like it is a few ms if in a tight loop, not including spill
     // overhead
     if (state.num_times_retried + 1 > 500) {
-      throw_java_exception(JAVA_OOM_CLASS, "retry limit exceeded");
+      throw_java_exception(JAVA_OOM_CLASS, "GPU OutOfMemory: retry limit exceeded");
     }
     state.num_times_retried++;
   }
@@ -651,14 +651,14 @@ class spark_resource_adaptor final : public rmm::mr::device_memory_resource {
                        const std::unique_lock<std::mutex> &lock) {
     state.num_times_retry_throw++;
     check_before_oom(state, lock);
-    throw_java_exception(RETRY_OOM_CLASS, "task should retry operation");
+    throw_java_exception(RETRY_OOM_CLASS, "GPU OutOfMemory");
   }
 
   void throw_split_n_retry_oom(const char *msg, full_thread_state &state,
                                const std::unique_lock<std::mutex> &lock) {
     state.num_times_split_retry_throw++;
     check_before_oom(state, lock);
-    throw_java_exception(SPLIT_AND_RETRY_OOM_CLASS, "task should split input and retry operation");
+    throw_java_exception(SPLIT_AND_RETRY_OOM_CLASS, "GPU OutOfMemory");
   }
 
   bool is_blocked(thread_state state) {
@@ -702,7 +702,7 @@ class spark_resource_adaptor final : public rmm::mr::device_memory_resource {
             break;
           case SHUFFLE_THROW:
             transition(thread->second, thread_state::SHUFFLE_RUNNING);
-            throw_java_exception(JAVA_OOM_CLASS, "could not allocate enough for shuffle");
+            throw_java_exception(JAVA_OOM_CLASS, "GPU OutOfMemory: could not allocate enough for shuffle");
             break;
           case TASK_BUFN_THROW:
             transition(thread->second, thread_state::TASK_BUFN_WAIT);