hiro/ray
1
0
Fork 0
mirror of https://github.com/vale981/ray synced 2025-03-06 02:21:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix window jni unhappy compiler (#9635)

Browse source
This commit is contained in:
Lingxuan Zuo 2020-07-23 19:43:53 +08:00 • committed by GitHub
parent 993ff5fd81
commit 64b0f173c8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/ray/core_worker/lib/java/io_ray_runtime_metric_NativeMetric.cc
View file

@ -47,7 +47,7 @@ inline void MetricTransform(JNIEnv *env, jstring j_name, jstring j_description,
// item when it already exists. // item when it already exists.
std::transform(tag_key_str_list.begin(), tag_key_str_list.end(), std::transform(tag_key_str_list.begin(), tag_key_str_list.end(),
std::back_inserter(tag_keys), std::back_inserter(tag_keys),
[](std::string tag_key) { return TagKeyType::Register(tag_key); }); [](std::string &tag_key) { return TagKeyType::Register(tag_key); });
} }
#ifdef __cplusplus #ifdef __cplusplus
@ -70,7 +70,7 @@ JNIEXPORT jlong JNICALL Java_io_ray_runtime_metric_NativeMetric_registerGaugeNat
MetricTransform(env, j_name, j_description, j_unit, tag_key_list, &metric_name, MetricTransform(env, j_name, j_description, j_unit, tag_key_list, &metric_name,
&description, &unit, tag_keys); &description, &unit, tag_keys);
auto *gauge = new ray::stats::Gauge(metric_name, description, unit, tag_keys); auto *gauge = new ray::stats::Gauge(metric_name, description, unit, tag_keys);
return reinterpret_cast<long>(gauge); return reinterpret_cast<jlong>(gauge);
} }
JNIEXPORT jlong JNICALL Java_io_ray_runtime_metric_NativeMetric_registerCountNative( JNIEXPORT jlong JNICALL Java_io_ray_runtime_metric_NativeMetric_registerCountNative(
@ -83,7 +83,7 @@ JNIEXPORT jlong JNICALL Java_io_ray_runtime_metric_NativeMetric_registerCountNat
MetricTransform(env, j_name, j_description, j_unit, tag_key_list, &metric_name, MetricTransform(env, j_name, j_description, j_unit, tag_key_list, &metric_name,
&description, &unit, tag_keys); &description, &unit, tag_keys);
auto *count = new ray::stats::Count(metric_name, description, unit, tag_keys); auto *count = new ray::stats::Count(metric_name, description, unit, tag_keys);
return reinterpret_cast<long>(count); return reinterpret_cast<jlong>(count);
} }
JNIEXPORT jlong JNICALL Java_io_ray_runtime_metric_NativeMetric_registerSumNative( JNIEXPORT jlong JNICALL Java_io_ray_runtime_metric_NativeMetric_registerSumNative(
@ -96,7 +96,7 @@ JNIEXPORT jlong JNICALL Java_io_ray_runtime_metric_NativeMetric_registerSumNativ
MetricTransform(env, j_name, j_description, j_unit, tag_key_list, &metric_name, MetricTransform(env, j_name, j_description, j_unit, tag_key_list, &metric_name,
&description, &unit, tag_keys); &description, &unit, tag_keys);
auto *sum = new ray::stats::Sum(metric_name, description, unit, tag_keys); auto *sum = new ray::stats::Sum(metric_name, description, unit, tag_keys);
return reinterpret_cast<long>(sum); return reinterpret_cast<jlong>(sum);
} }
JNIEXPORT jlong JNICALL Java_io_ray_runtime_metric_NativeMetric_registerHistogramNative( JNIEXPORT jlong JNICALL Java_io_ray_runtime_metric_NativeMetric_registerHistogramNative(
@ -114,7 +114,7 @@ JNIEXPORT jlong JNICALL Java_io_ray_runtime_metric_NativeMetric_registerHistogra
auto *histogram = auto *histogram =
new ray::stats::Histogram(metric_name, description, unit, boundaries, tag_keys); new ray::stats::Histogram(metric_name, description, unit, boundaries, tag_keys);
return reinterpret_cast<long>(histogram); return reinterpret_cast<jlong>(histogram);
} }
JNIEXPORT void JNICALL Java_io_ray_runtime_metric_NativeMetric_unregisterMetricNative( JNIEXPORT void JNICALL Java_io_ray_runtime_metric_NativeMetric_unregisterMetricNative(

10
src/ray/core_worker/lib/java/jni_utils.h
View file

@ -289,8 +289,9 @@ inline void JavaLongArrayToNativeLongVector(JNIEnv *env, jlongArray long_array,
std::vector<long> *native_vector) { std::vector<long> *native_vector) {
jlong *long_array_ptr = env->GetLongArrayElements(long_array, nullptr); jlong *long_array_ptr = env->GetLongArrayElements(long_array, nullptr);
jsize vec_size = env->GetArrayLength(long_array); jsize vec_size = env->GetArrayLength(long_array);
native_vector->insert(native_vector->begin(), long_array_ptr, for (int i = 0; i < vec_size; ++i) {
long_array_ptr + vec_size); native_vector->push_back(static_cast<long>(long_array_ptr[i]));
}
env->ReleaseLongArrayElements(long_array, long_array_ptr, 0); env->ReleaseLongArrayElements(long_array, long_array_ptr, 0);
} }
@ -299,8 +300,9 @@ inline void JavaDoubleArrayToNativeDoubleVector(JNIEnv *env, jdoubleArray double
std::vector<double> *native_vector) { std::vector<double> *native_vector) {
jdouble *double_array_ptr = env->GetDoubleArrayElements(double_array, nullptr); jdouble *double_array_ptr = env->GetDoubleArrayElements(double_array, nullptr);
jsize vec_size = env->GetArrayLength(double_array); jsize vec_size = env->GetArrayLength(double_array);
native_vector->insert(native_vector->begin(), double_array_ptr, for (int i = 0; i < vec_size; ++i) {
double_array_ptr + vec_size); native_vector->push_back(static_cast<double>(double_array_ptr[i]));
}
env->ReleaseDoubleArrayElements(double_array, double_array_ptr, 0); env->ReleaseDoubleArrayElements(double_array, double_array_ptr, 0);
} }