mirror of
https://github.com/zebrajr/pytorch.git
synced 2025-12-06 12:20:52 +01:00
[android][fbjni] Update fbjni to 0.2.2 (#68400)
Summary:
ghstack-source-id: caeb8df3a1
Pull Request resolved: https://github.com/pytorch/pytorch/pull/68400
Fixes #{issue number}
CI-all check:
https://github.com/pytorch/pytorch/pull/68497
Pull Request resolved: https://github.com/pytorch/pytorch/pull/68495
Reviewed By: linbinyu
Differential Revision: D32481451
Pulled By: IvanKobzarev
fbshipit-source-id: b19ce05ff9d63b3f701d718eefbf1e9d66e11639
This commit is contained in:
Ivan Kobzarev
Facebook GitHub Bot
parent
53bfb00ee1
commit
d71092f668
|
|
@ -51,9 +51,9 @@ android {
|
|||
dependencies {
|
||||
implementation 'com.android.support:appcompat-v7:28.0.0'
|
||||
implementation 'androidx.appcompat:appcompat:1.0.0'
|
||||
implementation 'com.facebook.fbjni:fbjni-java-only:0.0.3'
|
||||
implementation 'com.facebook.fbjni:fbjni-java-only:0.2.2'
|
||||
implementation 'com.google.code.findbugs:jsr305:3.0.1'
|
||||
implementation 'com.facebook.soloader:nativeloader:0.8.0'
|
||||
implementation 'com.facebook.soloader:nativeloader:0.10.1'
|
||||
|
||||
implementation 'junit:junit:' + rootProject.junitVersion
|
||||
implementation 'androidx.test:core:' + rootProject.coreVersion
|
||||
|
|
|
|||
|
|
@ -95,12 +95,12 @@ dependencies {
|
|||
implementation(name:'pytorch_android', ext:'aar')
|
||||
implementation(name:'pytorch_android_torchvision', ext:'aar')
|
||||
...
|
||||
implementation 'com.facebook.soloader:nativeloader:0.8.0'
|
||||
implementation 'com.facebook.fbjni:fbjni-java-only:0.0.3'
|
||||
implementation 'com.facebook.soloader:nativeloader:0.10.1'
|
||||
implementation 'com.facebook.fbjni:fbjni-java-only:0.2.2'
|
||||
}
|
||||
```
|
||||
We also have to add all transitive dependencies of our aars.
|
||||
As `pytorch_android` [depends](https://github.com/pytorch/pytorch/blob/master/android/pytorch_android/build.gradle#L76-L77) on `'com.facebook.soloader:nativeloader:0.8.0'` and `'com.facebook.fbjni:fbjni-java-only:0.0.3'`, we need to add them.
|
||||
As `pytorch_android` [depends](https://github.com/pytorch/pytorch/blob/master/android/pytorch_android/build.gradle#L76-L77) on `'com.facebook.soloader:nativeloader:0.10.1'` and `'com.facebook.fbjni:fbjni-java-only:0.2.2'`, we need to add them.
|
||||
(In case of using maven dependencies they are added automatically from `pom.xml`).
|
||||
|
||||
You can check out [test app example](https://github.com/pytorch/pytorch/blob/master/android/test_app/app/build.gradle) that uses aars directly.
|
||||
|
|
|
|||
|
|
@ -12,8 +12,8 @@ allprojects {
|
|||
rulesVersion = "1.2.0"
|
||||
junitVersion = "4.12"
|
||||
|
||||
fbjniJavaOnlyVersion = "0.0.3"
|
||||
soLoaderNativeLoaderVersion = "0.8.0"
|
||||
fbjniJavaOnlyVersion = "0.2.2"
|
||||
soLoaderNativeLoaderVersion = "0.10.1"
|
||||
}
|
||||
|
||||
repositories {
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit b592c5591345a05341ed6cd31d214e71e8bf4229
|
||||
Subproject commit 7e1e1fe3858c63c251c637ae41a20de425dde96f
|
||||
|
|
@ -32,8 +32,8 @@ sourceSets {
|
|||
|
||||
dependencies {
|
||||
compileOnly 'com.google.code.findbugs:jsr305:3.0.1'
|
||||
implementation 'com.facebook.soloader:nativeloader:0.8.0'
|
||||
implementation 'com.facebook.fbjni:fbjni-java-only:0.0.3'
|
||||
implementation 'com.facebook.soloader:nativeloader:0.10.1'
|
||||
implementation 'com.facebook.fbjni:fbjni-java-only:0.2.2'
|
||||
testImplementation 'junit:junit:4.12'
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -139,7 +139,7 @@ tasks.all { task ->
|
|||
|
||||
dependencies {
|
||||
implementation 'com.android.support:appcompat-v7:28.0.0'
|
||||
implementation 'com.facebook.soloader:nativeloader:0.8.0'
|
||||
implementation 'com.facebook.soloader:nativeloader:0.10.1'
|
||||
|
||||
localImplementation project(':pytorch_android')
|
||||
localImplementation project(':pytorch_android_torchvision')
|
||||
|
|
@ -154,8 +154,8 @@ dependencies {
|
|||
|
||||
aarImplementation(name:'pytorch_android', ext:'aar')
|
||||
aarImplementation(name:'pytorch_android_torchvision', ext:'aar')
|
||||
aarImplementation 'com.facebook.soloader:nativeloader:0.8.0'
|
||||
aarImplementation 'com.facebook.fbjni:fbjni-java-only:0.0.3'
|
||||
aarImplementation 'com.facebook.soloader:nativeloader:0.10.1'
|
||||
aarImplementation 'com.facebook.fbjni:fbjni-java-only:0.2.2'
|
||||
|
||||
def camerax_version = "1.0.0-alpha05"
|
||||
cameraImplementation "androidx.camera:camera-core:$camerax_version"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
if(INTERN_BUILD_MOBILE)
|
||||
if(BUILD_CAFFE2_MOBILE)
|
||||
caffe2_binary_target("predictor_verifier.cc")
|
||||
#caffe2_binary_target("predictor_verifier.cc")
|
||||
caffe2_binary_target("speed_benchmark.cc")
|
||||
else()
|
||||
caffe2_binary_target("speed_benchmark_torch.cc")
|
||||
|
|
@ -11,103 +11,103 @@ if(INTERN_BUILD_MOBILE)
|
|||
return()
|
||||
endif()
|
||||
|
||||
caffe2_binary_target("convert_caffe_image_db.cc")
|
||||
caffe2_binary_target("convert_db.cc")
|
||||
caffe2_binary_target("make_cifar_db.cc")
|
||||
caffe2_binary_target("make_mnist_db.cc")
|
||||
caffe2_binary_target("parallel_info.cc")
|
||||
target_include_directories(parallel_info PUBLIC
|
||||
${CMAKE_BINARY_DIR}/aten/src) # provides "ATen/TypeExtendedInterface.h" to ATen.h
|
||||
|
||||
caffe2_binary_target("intra_inter_benchmark.cc")
|
||||
target_include_directories(intra_inter_benchmark PUBLIC
|
||||
${CMAKE_BINARY_DIR}/aten/src)
|
||||
|
||||
caffe2_binary_target("at_launch_benchmark.cc")
|
||||
target_include_directories(at_launch_benchmark PUBLIC
|
||||
${CMAKE_BINARY_DIR}/aten/src)
|
||||
|
||||
caffe2_binary_target("record_function_benchmark.cc")
|
||||
target_include_directories(record_function_benchmark PUBLIC
|
||||
${CMAKE_BINARY_DIR}/aten/src)
|
||||
|
||||
caffe2_binary_target("predictor_verifier.cc")
|
||||
caffe2_binary_target("print_registered_core_operators.cc")
|
||||
caffe2_binary_target("run_plan.cc")
|
||||
caffe2_binary_target("speed_benchmark.cc")
|
||||
caffe2_binary_target("speed_benchmark_torch.cc")
|
||||
caffe2_binary_target("compare_models_torch.cc")
|
||||
caffe2_binary_target("split_db.cc")
|
||||
|
||||
caffe2_binary_target("db_throughput.cc")
|
||||
|
||||
if(BUILD_TEST)
|
||||
# Core overhead benchmark
|
||||
caffe2_binary_target("core_overhead_benchmark.cc")
|
||||
target_link_libraries(core_overhead_benchmark benchmark)
|
||||
endif()
|
||||
|
||||
if(USE_CUDA)
|
||||
caffe2_binary_target("inspect_gpu.cc")
|
||||
target_link_libraries(inspect_gpu ${CUDA_LIBRARIES})
|
||||
caffe2_binary_target("print_core_object_sizes_gpu.cc")
|
||||
|
||||
if(BUILD_TEST)
|
||||
# Core overhead benchmark
|
||||
caffe2_binary_target("core_overhead_benchmark_gpu.cc")
|
||||
target_link_libraries(core_overhead_benchmark_gpu benchmark ${CUDA_curand_LIBRARY})
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if(USE_ROCM)
|
||||
caffe2_hip_binary_target("hip/inspect_gpu.cc")
|
||||
caffe2_hip_binary_target("hip/print_core_object_sizes_gpu.cc")
|
||||
|
||||
if(BUILD_TEST)
|
||||
# Core overhead benchmark
|
||||
caffe2_hip_binary_target("hip/core_overhead_benchmark_gpu.cc")
|
||||
target_link_libraries(core_overhead_benchmark_gpu benchmark)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if(USE_ZMQ)
|
||||
caffe2_binary_target("zmq_feeder.cc")
|
||||
target_link_libraries(zmq_feeder ${ZMQ_LIBRARIES})
|
||||
endif()
|
||||
|
||||
if(USE_MPI)
|
||||
caffe2_binary_target("run_plan_mpi.cc")
|
||||
target_link_libraries(run_plan_mpi ${MPI_CXX_LIBRARIES})
|
||||
endif()
|
||||
|
||||
if(USE_OPENCV AND USE_LEVELDB)
|
||||
caffe2_binary_target("convert_encoded_to_raw_leveldb.cc")
|
||||
target_link_libraries(
|
||||
convert_encoded_to_raw_leveldb
|
||||
${OpenCV_LIBS} ${LevelDB_LIBRARIES} ${Snappy_LIBRARIES})
|
||||
endif()
|
||||
|
||||
if(USE_OPENCV)
|
||||
caffe2_binary_target("make_image_db.cc")
|
||||
target_link_libraries(make_image_db ${OpenCV_LIBS})
|
||||
caffe2_binary_target("convert_image_to_tensor.cc")
|
||||
target_link_libraries(convert_image_to_tensor ${OpenCV_LIBS})
|
||||
endif()
|
||||
|
||||
if(USE_OBSERVERS)
|
||||
caffe2_binary_target(caffe2_benchmark "caffe2_benchmark.cc" "benchmark_helper.cc")
|
||||
endif()
|
||||
|
||||
if(USE_OBSERVERS AND USE_OPENCV)
|
||||
caffe2_binary_target("convert_and_benchmark.cc")
|
||||
target_link_libraries(convert_and_benchmark ${OpenCV_LIBS})
|
||||
endif()
|
||||
|
||||
# ---[ tutorials
|
||||
caffe2_binary_target("tutorial_blob.cc")
|
||||
|
||||
caffe2_binary_target("dump_operator_names.cc")
|
||||
caffe2_binary_target("optimize_for_mobile.cc")
|
||||
#caffe2_binary_target("convert_caffe_image_db.cc")
|
||||
#caffe2_binary_target("convert_db.cc")
|
||||
#caffe2_binary_target("make_cifar_db.cc")
|
||||
#caffe2_binary_target("make_mnist_db.cc")
|
||||
#caffe2_binary_target("parallel_info.cc")
|
||||
#target_include_directories(parallel_info PUBLIC
|
||||
# ${CMAKE_BINARY_DIR}/aten/src) # provides "ATen/TypeExtendedInterface.h" to ATen.h
|
||||
#
|
||||
#caffe2_binary_target("intra_inter_benchmark.cc")
|
||||
#target_include_directories(intra_inter_benchmark PUBLIC
|
||||
# ${CMAKE_BINARY_DIR}/aten/src)
|
||||
#
|
||||
#caffe2_binary_target("at_launch_benchmark.cc")
|
||||
#target_include_directories(at_launch_benchmark PUBLIC
|
||||
# ${CMAKE_BINARY_DIR}/aten/src)
|
||||
#
|
||||
#caffe2_binary_target("record_function_benchmark.cc")
|
||||
#target_include_directories(record_function_benchmark PUBLIC
|
||||
# ${CMAKE_BINARY_DIR}/aten/src)
|
||||
#
|
||||
##caffe2_binary_target("predictor_verifier.cc")
|
||||
#caffe2_binary_target("print_registered_core_operators.cc")
|
||||
#caffe2_binary_target("run_plan.cc")
|
||||
#caffe2_binary_target("speed_benchmark.cc")
|
||||
#caffe2_binary_target("speed_benchmark_torch.cc")
|
||||
#caffe2_binary_target("compare_models_torch.cc")
|
||||
#caffe2_binary_target("split_db.cc")
|
||||
#
|
||||
#caffe2_binary_target("db_throughput.cc")
|
||||
#
|
||||
#if(BUILD_TEST)
|
||||
# # Core overhead benchmark
|
||||
# caffe2_binary_target("core_overhead_benchmark.cc")
|
||||
# target_link_libraries(core_overhead_benchmark benchmark)
|
||||
#endif()
|
||||
#
|
||||
#if(USE_CUDA)
|
||||
# caffe2_binary_target("inspect_gpu.cc")
|
||||
# target_link_libraries(inspect_gpu ${CUDA_LIBRARIES})
|
||||
# caffe2_binary_target("print_core_object_sizes_gpu.cc")
|
||||
#
|
||||
# if(BUILD_TEST)
|
||||
# # Core overhead benchmark
|
||||
# caffe2_binary_target("core_overhead_benchmark_gpu.cc")
|
||||
# target_link_libraries(core_overhead_benchmark_gpu benchmark ${CUDA_curand_LIBRARY})
|
||||
# endif()
|
||||
#endif()
|
||||
#
|
||||
#if(USE_ROCM)
|
||||
# caffe2_hip_binary_target("hip/inspect_gpu.cc")
|
||||
# caffe2_hip_binary_target("hip/print_core_object_sizes_gpu.cc")
|
||||
#
|
||||
# if(BUILD_TEST)
|
||||
# # Core overhead benchmark
|
||||
# caffe2_hip_binary_target("hip/core_overhead_benchmark_gpu.cc")
|
||||
# target_link_libraries(core_overhead_benchmark_gpu benchmark)
|
||||
# endif()
|
||||
#endif()
|
||||
#
|
||||
#if(USE_ZMQ)
|
||||
# caffe2_binary_target("zmq_feeder.cc")
|
||||
# target_link_libraries(zmq_feeder ${ZMQ_LIBRARIES})
|
||||
#endif()
|
||||
#
|
||||
#if(USE_MPI)
|
||||
# caffe2_binary_target("run_plan_mpi.cc")
|
||||
# target_link_libraries(run_plan_mpi ${MPI_CXX_LIBRARIES})
|
||||
#endif()
|
||||
#
|
||||
#if(USE_OPENCV AND USE_LEVELDB)
|
||||
# caffe2_binary_target("convert_encoded_to_raw_leveldb.cc")
|
||||
# target_link_libraries(
|
||||
# convert_encoded_to_raw_leveldb
|
||||
# ${OpenCV_LIBS} ${LevelDB_LIBRARIES} ${Snappy_LIBRARIES})
|
||||
#endif()
|
||||
#
|
||||
#if(USE_OPENCV)
|
||||
# caffe2_binary_target("make_image_db.cc")
|
||||
# target_link_libraries(make_image_db ${OpenCV_LIBS})
|
||||
# caffe2_binary_target("convert_image_to_tensor.cc")
|
||||
# target_link_libraries(convert_image_to_tensor ${OpenCV_LIBS})
|
||||
#endif()
|
||||
#
|
||||
#if(USE_OBSERVERS)
|
||||
# caffe2_binary_target(caffe2_benchmark "caffe2_benchmark.cc" "benchmark_helper.cc")
|
||||
#endif()
|
||||
#
|
||||
#if(USE_OBSERVERS AND USE_OPENCV)
|
||||
# caffe2_binary_target("convert_and_benchmark.cc")
|
||||
# target_link_libraries(convert_and_benchmark ${OpenCV_LIBS})
|
||||
#endif()
|
||||
#
|
||||
## ---[ tutorials
|
||||
#caffe2_binary_target("tutorial_blob.cc")
|
||||
#
|
||||
#caffe2_binary_target("dump_operator_names.cc")
|
||||
#caffe2_binary_target("optimize_for_mobile.cc")
|
||||
|
||||
caffe2_binary_target(aot_model_compiler "aot_model_compiler.cc")
|
||||
target_link_libraries(aot_model_compiler torch)
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user