Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added support for setGraphExecutorOptimize with torchscript models. #904

Merged
merged 4 commits into from
Apr 27, 2021
Merged

Added support for setGraphExecutorOptimize with torchscript models. #904

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
25581a2
Added support for setGraphExecutorOptimize in torchscript to prevent …
hodovo Apr 27, 2021
7062213
Reverted back to cu102 default in build.gradle for pytorch-native.
hodovo Apr 27, 2021
766dd36
Removed optimizeProperty check on first forward pass of PtSymbolBlock…
hodovo Apr 27, 2021
6ddac4b
Reformat java and C++ code
frankfliu Apr 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions pytorch/pytorch-engine/src/main/java/ai/djl/pytorch/jni/JniUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1367,6 +1367,10 @@ public static void deleteModule(long pointer) {
PyTorchLibrary.LIB.torchDeleteModule(pointer);
}

public static void setGraphExecutorOptimize(boolean enabled) {
PyTorchLibrary.LIB.setGraphExecutorOptimize(enabled);
}

public static PtSymbolBlock loadModule(
PtNDManager manager,
Path path,
Expand Down
2 changes: 2 additions & 0 deletions pytorch/pytorch-engine/src/main/java/ai/djl/pytorch/jni/PyTorchLibrary.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,6 +472,8 @@ native long moduleLoad(

native long moduleForward(long moduleHandle, long[] iValueHandles, boolean isTrain);

native void setGraphExecutorOptimize(boolean enabled);

native void moduleWrite(long moduleHandle, OutputStream os, byte[] buffer, boolean writeSize);

native long[] moduleGetParams(long moduleHandle);
Expand Down
10 changes: 9 additions & 1 deletion pytorch/pytorch-native/src/main/native/ai_djl_pytorch_jni_PyTorchLibrary_inference.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
* OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions
* and limitations under the License.
*/
#include <torch/csrc/jit/python/update_graph_executor_opt.h>
#include <torch/script.h>

#include "ai_djl_pytorch_jni_PyTorchLibrary.h"
Expand Down Expand Up @@ -117,7 +118,7 @@ JNIEXPORT void JNICALL Java_ai_djl_pytorch_jni_PyTorchLibrary_moduleWrite(
for (int i = 0; i < 8; i++) {
bytes[i] = static_cast<int>(length >> (56 - 8 * i) & 0XFF);
}
env->SetByteArrayRegion(jbytes, 0, 8, (jbyte*)bytes);
env->SetByteArrayRegion(jbytes, 0, 8, (jbyte*) bytes);
env->CallVoidMethod(jos, method_id, jbytes, 0, 8);
}
int len = env->GetArrayLength(arr);
Expand All @@ -136,6 +137,13 @@ JNIEXPORT void JNICALL Java_ai_djl_pytorch_jni_PyTorchLibrary_moduleWrite(
API_END()
}

JNIEXPORT void JNICALL Java_ai_djl_pytorch_jni_PyTorchLibrary_setGraphExecutorOptimize(
JNIEnv* env, jobject jthis, jboolean jenabled) {
API_BEGIN()
torch::jit::setGraphExecutorOptimize(jenabled);
API_END()
}

JNIEXPORT void JNICALL Java_ai_djl_pytorch_jni_PyTorchLibrary_moduleEval(
JNIEnv* env, jobject jthis, jlong module_handle) {
API_BEGIN()
Expand Down