File: removing_void_doneNative.patch

package info (click to toggle)
gkl 0.9.1%2Bdfsg-1
  • links: PTS, VCS
  • area: main
  • in suites: forky, sid
  • size: 44,176 kB
  • sloc: ansic: 57,712; asm: 39,350; cpp: 6,101; java: 2,639; sh: 1,866; makefile: 887; pascal: 317; xml: 106; perl: 104
file content (157 lines) | stat: -rw-r--r-- 4,588 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
Description: removing calls to doneNative methods, which are empty and cause
 UnsatisfiedLinkError in the tests.
Author: Pierre Gruet <pgt@debian.org>
Forwarded: not-needed
Last-Update: 2025-08-31

--- a/src/main/java/com/intel/gkl/pairhmm/IntelPairHmm.java
+++ b/src/main/java/com/intel/gkl/pairhmm/IntelPairHmm.java
@@ -151,7 +151,6 @@
      */
     @Override
     public void done() {
-        doneNative();
     }
 
     private native static void initNative(Class<?> readDataHolderClass,
@@ -162,6 +161,4 @@
     private native void computeLikelihoodsNative(Object[] readDataArray,
                                                  Object[] haplotypeDataArray,
                                                  double[] likelihoodArray);
-
-    private native void doneNative();
 }
--- a/src/main/java/com/intel/gkl/pdhmm/IntelPDHMM.java
+++ b/src/main/java/com/intel/gkl/pdhmm/IntelPDHMM.java
@@ -122,7 +122,6 @@
 
     @Override
     public void done() {
-        doneNative();
     }
 
     private static void checkArraySize(Object array, int expectedSize, String arrayName) {
@@ -214,7 +213,4 @@
     private native void computeLikelihoodsNative(Object[] readDataArray,
             Object[] haplotypeDataArray,
             double[] likelihoodArray);
-
-    private native static void doneNative();
-
 }
--- a/src/main/java/com/intel/gkl/smithwaterman/IntelSmithWaterman.java
+++ b/src/main/java/com/intel/gkl/smithwaterman/IntelSmithWaterman.java
@@ -182,11 +182,9 @@
 
     public void close()
     {
-        doneNative();
     }
 
     private native static void initNative();
     private native static int alignNative(byte[] refArray, byte[] altArray, byte[] cigar, int match, int mismatch, int open, int extend, byte strategy);
-    private native static void doneNative();
 }
 
--- a/src/main/native/pairhmm/IntelPairHmm.cc
+++ b/src/main/native/pairhmm/IntelPairHmm.cc
@@ -179,14 +179,3 @@
 
   DBG("Exit");
 }
-
-
-/*
- * Class:     com_intel_gkl_pairhmm_IntelPairHmm
- * Method:    doneNative
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_com_intel_gkl_pairhmm_IntelPairHmm_doneNative
-(JNIEnv* env, jobject obj)
-{
-}
--- a/src/main/native/pairhmm/IntelPairHmm.h
+++ b/src/main/native/pairhmm/IntelPairHmm.h
@@ -46,14 +46,6 @@
 JNIEXPORT void JNICALL Java_com_intel_gkl_pairhmm_IntelPairHmm_computeLikelihoodsNative
   (JNIEnv *, jobject, jobjectArray, jobjectArray, jdoubleArray);
 
-/*
- * Class:     com_intel_gkl_pairhmm_IntelPairHmm
- * Method:    doneNative
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_com_intel_gkl_pairhmm_IntelPairHmm_doneNative
-  (JNIEnv *, jobject);
-
 #ifdef __cplusplus
 }
 #endif
--- a/src/main/native/pdhmm/IntelPDHMM.cc
+++ b/src/main/native/pdhmm/IntelPDHMM.cc
@@ -242,8 +242,3 @@
     _mm_free(result);
     return jresult;
 }
-
-JNIEXPORT void JNICALL Java_com_intel_gkl_pdhmm_IntelPDHMM_doneNative(JNIEnv *env, jclass obj)
-{
-    doneNative();
-}
--- a/src/main/native/pdhmm/IntelPDHMM.h
+++ b/src/main/native/pdhmm/IntelPDHMM.h
@@ -45,8 +45,6 @@
      */
     JNIEXPORT void JNICALL Java_com_intel_gkl_pdhmm_IntelPDHMM_computeLikelihoodsNative(JNIEnv *, jobject, jobjectArray, jobjectArray, jdoubleArray);
 
-    JNIEXPORT void JNICALL Java_com_intel_gkl_pdhmm_IntelPDHMM_doneNative(JNIEnv *env, jclass obj);
-
 #ifdef __cplusplus
 }
 #endif
--- a/src/main/native/pdhmm/pdhmm-implementation.h
+++ b/src/main/native/pdhmm/pdhmm-implementation.h
@@ -324,11 +324,6 @@
     return true;
 }
 
-bool doneNative()
-{
-    return true;
-}
-
 int32_t computePDHMM(PDHMMInputData input)
 {
     ComputeConfig &config = ComputeConfig::getInstance();
--- a/src/main/native/smithwaterman/IntelSmithWaterman.cc
+++ b/src/main/native/smithwaterman/IntelSmithWaterman.cc
@@ -122,12 +122,3 @@
 
     return offset;
 }
-
-/*
- * Class:     com_intel_gkl_smithwaterman_IntelSmithWaterman
- * Method:    doneNative
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_com_intel_gkl_smithwaterman_IntelSmithWaterman_doneNative(JNIEnv *, jclass)
-{
-}
--- a/src/main/native/smithwaterman/IntelSmithWaterman.h
+++ b/src/main/native/smithwaterman/IntelSmithWaterman.h
@@ -41,14 +41,6 @@
 JNIEXPORT jint JNICALL Java_com_intel_gkl_smithwaterman_IntelSmithWaterman_alignNative
   (JNIEnv *, jclass, jbyteArray, jbyteArray, jbyteArray, jint, jint, jint, jint, jbyte);
 
-/*
- * Class:     com_intel_gkl_smithwaterman_IntelSmithWaterman
- * Method:    doneNative
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_com_intel_gkl_smithwaterman_IntelSmithWaterman_doneNative
-  (JNIEnv *, jclass);
-
 #ifdef __cplusplus
 }
 #endif