rename.

dmlc · Jan 20, 2025 · be1234b · be1234b
1 parent 7d59b7c
commit be1234b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 26 deletions.
diff --git a/jvm-packages/xgboost4j/src/native/xgboost4j-gpu.cu b/jvm-packages/xgboost4j/src/native/xgboost4j-gpu.cu
@@ -400,14 +400,14 @@ class DataIteratorProxy {
 };
 
 // An iterator proxy for external memory.
-class ExternalMemoryIteratorProxy {
+class ExtMemIteratorProxy {
   JvmIter jiter_;
   DMatrixProxy proxy_;
 
  public:
-  explicit ExternalMemoryIteratorProxy(jobject jiter) : jiter_(jiter) {}
+  explicit ExtMemIteratorProxy(jobject jiter) : jiter_(jiter) {}
 
-  ~ExternalMemoryIteratorProxy() = default;
+  ~ExtMemIteratorProxy() = default;
 
   DMatrixHandle GetDMatrixHandle() const { return proxy_.GetDMatrixHandle(); }
 
@@ -473,11 +473,11 @@ int Next(DataIterHandle self) {
 }
 
 void ExternalMemoryReset(DataIterHandle self) {
-  static_cast<xgboost::jni::ExternalMemoryIteratorProxy *>(self)->Reset();
+  static_cast<xgboost::jni::ExtMemIteratorProxy *>(self)->Reset();
 }
 
 int ExternalMemoryNext(DataIterHandle self) {
-  return static_cast<xgboost::jni::ExternalMemoryIteratorProxy *>(self)->Next();
+  return static_cast<xgboost::jni::ExtMemIteratorProxy *>(self)->Next();
 }
 
 template <typename T>
@@ -503,7 +503,7 @@ XGB_DLL int XGQuantileDMatrixCreateFromCallbackImpl(JNIEnv *jenv, jclass, jobjec
   auto use_ext_mem = OptionalArg<Boolean>(jconfig, "use_ext_mem", false);
   int ret = 0;
   if (use_ext_mem) {
-    xgboost::jni::ExternalMemoryIteratorProxy proxy(jdata_iter);
+    xgboost::jni::ExtMemIteratorProxy proxy(jdata_iter);
     ret = XGExtMemQuantileDMatrixCreateFromCallback(&proxy, proxy.GetDMatrixHandle(), ref,
                                                     ExternalMemoryReset, ExternalMemoryNext, config,
                                                     &result);

diff --git a/jvm-packages/xgboost4j/src/native/xgboost4j.cpp b/jvm-packages/xgboost4j/src/native/xgboost4j.cpp
@@ -1301,9 +1301,6 @@ namespace xgboost::jni {
 XGB_DLL int XGQuantileDMatrixCreateFromCallbackImpl(JNIEnv *jenv, jclass jcls, jobject jdata_iter,
                                                     jobject jref_iter, char const *config,
                                                     jlongArray jout);
-XGB_DLL int XGQuantileDMatrixCreateFromExternalMemoryCallbackImpl
-    (JNIEnv *jenv, jclass jcls, jobject jdata_iter, jobject jref_iter, char const *config,
-     jlongArray jout);
 }  // namespace xgboost::jni
 
 /*
@@ -1322,23 +1319,6 @@ JNIEXPORT jint JNICALL Java_ml_dmlc_xgboost4j_java_XGBoostJNI_XGQuantileDMatrixC
                                                                conf.get(), jout);
 }
 
-/*
- * Class:     ml_dmlc_xgboost4j_java_XGBoostJNI
- * Method:    XGQuantileDMatrixCreateFromExternalMemoryCallback
- * Signature: (Ljava/util/Iterator;[JLjava/lang/String;[J)I
- */
-JNIEXPORT jint JNICALL Java_ml_dmlc_xgboost4j_java_XGBoostJNI_XGQuantileDMatrixCreateFromExternalMemoryCallback(
-    JNIEnv *jenv, jclass jcls, jobject jdata_iter, jlongArray jref, jstring jconf,
-    jlongArray jout) {
-  std::unique_ptr<char const, Deleter<char const>> conf{jenv->GetStringUTFChars(jconf, nullptr),
-                                                        [&](char const *ptr) {
-                                                          jenv->ReleaseStringUTFChars(jconf, ptr);
-                                                        }};
-  return xgboost::jni::XGQuantileDMatrixCreateFromExternalMemoryCallbackImpl(jenv, jcls, jdata_iter,
-                                                                             jref, conf.get(), jout);
-
-}
-
 /*
  * Class:     ml_dmlc_xgboost4j_java_XGBoostJNI
  * Method:    XGDMatrixSetInfoFromInterface