add a wrapper for getAvailableTargets by JulienMaille · Pull Request #16273 · opencv/opencv

JulienMaille · 2019-12-31T14:32:38Z

as requested by @dkurt here: #16184 (comment)

force_builders=Custom,Custom Win,Custom Mac
build_image:Custom=ubuntu-openvino-2019r3.0:16.04
build_image:Custom Win=openvino-2019r3.0
build_image:Custom Mac=openvino-2019r3.0

test_modules:Custom=dnn,python2,python3,java
test_modules:Custom Win=dnn,python2,python3,java
test_modules:Custom Mac=dnn,python2,python3,java

buildworker:Custom=linux-1
# disabled due high memory usage: test_opencl:Custom=ON
test_opencl:Custom=OFF
test_bigdata:Custom=1
test_filter:Custom=*

dkurt · 2020-01-02T12:04:47Z

Thanks!
Please change target branch to 3.4. We will port to master branch

JulienMaille · 2020-01-02T13:00:08Z

done

dkurt

👍 Thank you!

alalek · 2020-01-03T08:31:50Z

Could you please add simple bindings tests?

Check should be simple enough (DNN_BACKEND_OPENCV+DNN_TARGET_CPU is always available).

Thank you!

JulienMaille · 2020-01-03T22:43:15Z

@alalek something like this?

def test_getAvailableTargets(self):
    targets = cv.dnn.getAvailableTargets(cv.dnn.DNN_BACKEND_OPENCV)
    test.assertIn(cv.dnn.DNN_TARGET_CPU, targets)

alalek · 2020-01-04T08:48:08Z

@JulienMaille Yes

JulienMaille · 2020-01-06T21:50:04Z

I tried my best, but I'm gonna need help with the java test

JulienMaille · 2020-01-08T20:08:57Z

@alalek Python test is ok but this is the error I get for the java one:

    [javac] /build/precommit_linux64/build/java_test/src/org/opencv/test/dnn/DnnTensorFlowTest.java:146: error: cannot find symbol
    [javac]         List<Integer> targets = Dnn.getAvailableTargets(Dnn.DNN_BACKEND_OPENCV);
    [javac]                                    ^
    [javac]   symbol:   method getAvailableTargets(int)
    [javac]   location: class Dnn

I probably has to do with the fact it expects an enum Backend and receives an int

add tests

JulienMaille · 2020-01-09T23:51:36Z

@dkurt can the issue with java be solved without changing the signature to take an int instead of an enum?

dkurt · 2020-01-10T06:46:48Z

@JulienMaille, I will try to check it.

dkurt · 2020-01-16T16:27:28Z

@JulienMaille, may I ask you to try the following changes?

diff --git a/modules/dnn/include/opencv2/dnn/dnn.hpp b/modules/dnn/include/opencv2/dnn/dnn.hpp
index a2030ad..4699dac 100644
--- a/modules/dnn/include/opencv2/dnn/dnn.hpp
+++ b/modules/dnn/include/opencv2/dnn/dnn.hpp
@@ -97,7 +97,7 @@ CV__DNN_INLINE_NS_BEGIN
     };
 
     CV_EXPORTS std::vector< std::pair<Backend, Target> > getAvailableBackends();
-    CV_EXPORTS_W std::vector<Target> getAvailableTargets(Backend be);
+    CV_EXPORTS_W std::vector<Target> getAvailableTargets(dnn::Backend be);
 
     /** @brief This class provides all data needed to initialize layer.
      *
diff --git a/modules/dnn/misc/java/gen_dict.json b/modules/dnn/misc/java/gen_dict.json
index c0e0a1b..5a397ea 100644
--- a/modules/dnn/misc/java/gen_dict.json
+++ b/modules/dnn/misc/java/gen_dict.json
@@ -36,6 +36,14 @@
             "v_type": "vector_Layer",
             "j_import": "org.opencv.dnn.Layer"
         },
+        "vector_Target": {
+            "j_type": "List<Integer>",
+            "jn_type": "List<Integer>",
+            "jni_type": "jobject",
+            "jni_var": "std::vector< cv::dnn::Target > %(n)s",
+            "suffix": "Ljava_util_List",
+            "v_type": "vector_Target"
+        },
         "LayerId": {
             "j_type": "DictValue",
             "jn_type": "long",
diff --git a/modules/dnn/misc/java/src/cpp/dnn_converters.cpp b/modules/dnn/misc/java/src/cpp/dnn_converters.cpp
index 1d259ae..95184c0 100644
--- a/modules/dnn/misc/java/src/cpp/dnn_converters.cpp
+++ b/modules/dnn/misc/java/src/cpp/dnn_converters.cpp
@@ -60,6 +60,25 @@ jobject vector_Ptr_Layer_to_List(JNIEnv* env, std::vector<cv::Ptr<cv::dnn::Layer
     return result;
 }
 
+jobject vector_Target_to_List(JNIEnv* env, std::vector<cv::dnn::Target>& vs)
+{
+    static jclass juArrayList   = ARRAYLIST(env);
+    static jmethodID m_create   = CONSTRUCTOR(env, juArrayList);
+    jmethodID m_add       = LIST_ADD(env, juArrayList);
+
+    static jclass jInteger = env->FindClass("java/lang/Integer");
+    static jmethodID m_create_Integer = env->GetMethodID(jInteger, "<init>", "(I)V");
+
+    jobject result = env->NewObject(juArrayList, m_create, vs.size());
+    for (size_t i = 0; i < vs.size(); ++i)
+    {
+        jobject element = env->NewObject(jInteger, m_create_Integer, vs[i]);
+        env->CallBooleanMethod(result, m_add, element);
+        env->DeleteLocalRef(element);
+    }
+    return result;
+}
+
 std::vector<cv::Ptr<cv::dnn::Layer> > List_to_vector_Ptr_Layer(JNIEnv* env, jobject list)
 {
     static jclass juArrayList       = ARRAYLIST(env);
diff --git a/modules/dnn/misc/java/src/cpp/dnn_converters.hpp b/modules/dnn/misc/java/src/cpp/dnn_converters.hpp
index 6a72701..e1f63e0 100644
--- a/modules/dnn/misc/java/src/cpp/dnn_converters.hpp
+++ b/modules/dnn/misc/java/src/cpp/dnn_converters.hpp
@@ -28,5 +28,6 @@ jobject vector_Ptr_Layer_to_List(JNIEnv* env, std::vector<cv::Ptr<cv::dnn::Layer
 
 std::vector<cv::Ptr<cv::dnn::Layer> > List_to_vector_Ptr_Layer(JNIEnv* env, jobject list);
 
+jobject vector_Target_to_List(JNIEnv* env, std::vector<cv::dnn::Target>& vs);
 
 #endif /* DNN_CONVERTERS_HPP */

JulienMaille · 2020-01-16T21:30:05Z

@dkurt done

dkurt

👍 Looks good to me! Thanks!

dkurt added the category: dnn label Jan 2, 2020

JulienMaille changed the base branch from master to 3.4 January 2, 2020 12:59

dkurt previously approved these changes Jan 2, 2020

View reviewed changes

JulienMaille force-pushed the wrapper_available_target branch 6 times, most recently from 27582c4 to 651f17b Compare January 6, 2020 23:20

add a wrapper for getAvailableTargets

6f1dd88

JulienMaille force-pushed the wrapper_available_target branch from 651f17b to 6f1dd88 Compare January 16, 2020 19:59

add java wrapper on Target enum

69a13de

dkurt approved these changes Jan 17, 2020

View reviewed changes

dkurt self-assigned this Jan 17, 2020

alalek merged commit 886220b into opencv:3.4 Jan 17, 2020

JulienMaille deleted the wrapper_available_target branch January 17, 2020 16:37

alalek mentioned this pull request Jan 22, 2020

Merge 3.4 #16406

Merged

Uh oh!

Conversation

JulienMaille commented Dec 31, 2019 • edited by alalek Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dkurt commented Jan 2, 2020

Uh oh!

JulienMaille commented Jan 2, 2020

Uh oh!

dkurt left a comment

Choose a reason for hiding this comment

Uh oh!

alalek commented Jan 3, 2020

Uh oh!

JulienMaille commented Jan 3, 2020

Uh oh!

alalek commented Jan 4, 2020

Uh oh!

JulienMaille commented Jan 6, 2020

Uh oh!

JulienMaille commented Jan 8, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

JulienMaille commented Jan 9, 2020

Uh oh!

dkurt commented Jan 10, 2020

Uh oh!

dkurt commented Jan 16, 2020

Uh oh!

JulienMaille commented Jan 16, 2020

Uh oh!

dkurt left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

JulienMaille commented Dec 31, 2019 •

edited by alalek

Loading

JulienMaille commented Jan 8, 2020 •

edited

Loading