Fix nits

bytedeco · Jun 26, 2023 · 2ca0f6e · 2ca0f6e
1 parent dba0755
commit 2ca0f6e
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,6 @@
 
  * Map new higher-level C++ API of Triton Inference Server ([pull #1361](https://github.com/bytedeco/javacpp-presets/pull/1361))
- * Upgrade presets for Triton Inference Server 2.34.0
- * Upgrade presets for DNNL 3.1.1, CPython 3.11.4, NumPy 1.25.0, SciPy 1.11.0, LLVM 16.0.6, ONNX Runtime 1.15.1, and their dependencies
+ * Upgrade presets for DNNL 3.1.1, CPython 3.11.4, NumPy 1.25.0, SciPy 1.11.0, LLVM 16.0.6, Triton Inference Server 2.34.0, ONNX Runtime 1.15.1, and their dependencies
 
 ### June 6, 2023 version 1.5.9
  * Virtualize `nvinfer1::IGpuAllocator` from TensorRT to allow customization ([pull #1367](https://github.com/bytedeco/javacpp-presets/pull/1367))

diff --git a/tritonserver/cppbuild.sh b/tritonserver/cppbuild.sh
@@ -19,7 +19,7 @@ if [[ ! -f "/opt/tritonserver/include/triton/developer_tools/generic_server_wrap
     mkdir -p ${BUILD_HOME} && cd ${BUILD_HOME}
     git clone --single-branch --depth=1 -b ${TRITON_CORE_REPO_TAG} ${TRITON_CORE_REPO}
     cp core/include/triton/core/* ${TRITON_HOME}/include/triton/core/.
-    
+
     # Build CPP library and copy over dependencies
     git clone --single-branch --depth=1 -b ${TOOLS_BRANCH_TAG} ${TOOLS_BRANCH}
     cd developer_tools/server

diff --git a/tritonserver/samples/simplecpp/SimpleCPP.java b/tritonserver/samples/simplecpp/SimpleCPP.java
@@ -31,6 +31,7 @@
 import org.bytedeco.javacpp.*;
 import org.bytedeco.tritonserver.tritondevelopertoolsserver.*;
 import static org.bytedeco.tritonserver.global.tritondevelopertoolsserver.*;
+
 public class SimpleCPP {
     // Helper functions
     static void FAIL(String MSG) {
@@ -48,7 +49,7 @@ static void Usage(String msg) {
       System.err.println("\t-r [model repository absolute path]");
       System.exit(1);
     }
-    
+
     static void
     CompareResult(
         String output0_name, String output1_name,
@@ -90,12 +91,12 @@ static int RunInference(int verbose_level, String model_repository_path, String
       GenericTritonServer server = GenericTritonServer.Create(options);
       StringSet loaded_models = server.LoadedModels();
       System.out.println("Loaded_models count : " + loaded_models.size());
-      
+
       InferOptions infer_options = new InferOptions(model_name);
       GenericInferRequest request = GenericInferRequest.Create(infer_options);
 
       BytePointer input0_data;
-      BytePointer input1_data; 
+      BytePointer input1_data;
       IntPointer[] p0 = {null}, p1 = {null};
       GenerateInputData(p0, p1);
       input0_data = p0[0].getPointer(BytePointer.class);
@@ -147,7 +148,7 @@ static int RunInference(int verbose_level, String model_repository_path, String
           break;
         }
       }
-    
+
       // We use a simple model that takes 2 input tensors of 16 strings
       // each and returns 2 output tensors of 16 strings each. The input
       // strings must represent integers. One output tensor is the
@@ -162,5 +163,4 @@ static int RunInference(int verbose_level, String model_repository_path, String
 
       System.exit(0);
     }
-
 }
diff --git a/tritonserver/src/main/java/org/bytedeco/tritonserver/presets/tritondevelopertoolsserver.java b/tritonserver/src/main/java/org/bytedeco/tritonserver/presets/tritondevelopertoolsserver.java
@@ -34,7 +34,7 @@
 
 /**
  *
- * @author Katherine Yang, Baojun Liu, Samuel Audet
+ * @author Katherine Yang, Baojun Liu
  */
 @Properties(
     value = {

diff --git a/tritonserver/src/main/java/org/bytedeco/tritonserver/presets/tritonserver.java b/tritonserver/src/main/java/org/bytedeco/tritonserver/presets/tritonserver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2023 Jack He, Samuel Audet, Katherine Yang, Baojun Liu
+ * Copyright (C) 2021 Jack He, Samuel Audet
  *
  * Licensed either under the Apache License, Version 2.0, or (at your option)
  * under the terms of the GNU General Public License as published by
@@ -34,14 +34,14 @@
 
 /**
  *
- * @author Katherine Yang, Jack He, Baojun Liu
+ * @author Jack He
  */
 @Properties(
     value = {
         @Platform(
             value = {"linux-arm64", "linux-ppc64le", "linux-x86_64", "windows-x86_64"},
             include = {"tritonserver.h", "tritonbackend.h", "tritonrepoagent.h"},
-            link = {"tritonserver"},
+            link = "tritonserver",
             includepath = {"/opt/tritonserver/include/triton/core/", "/opt/tritonserver/include/", "/usr/include"},
             linkpath = {"/opt/tritonserver/lib/"}
         ),
@@ -64,6 +64,7 @@ public void map(InfoMap infoMap) {
                .put(new Info("std::size_t").cast().valueTypes("long").pointerTypes("LongPointer", "LongBuffer", "long[]"))
                .put(new Info("TRITONSERVER_EXPORT", "TRITONSERVER_DECLSPEC",
                              "TRITONBACKEND_DECLSPEC", "TRITONBACKEND_ISPEC",
-                             "TRITONREPOAGENT_DECLSPEC", "TRITONREPOAGENT_ISPEC").cppTypes().annotations());
+                             "TRITONREPOAGENT_DECLSPEC", "TRITONREPOAGENT_ISPEC").cppTypes().annotations())
+        ;
     }
 }
diff --git a/tritonserver/src/main/java9/module-info.java b/tritonserver/src/main/java9/module-info.java
@@ -2,8 +2,6 @@
   requires transitive org.bytedeco.javacpp;
   exports org.bytedeco.tritonserver.global;
   exports org.bytedeco.tritonserver.presets;
-  exports org.bytedeco.tritonserver;
-
   exports org.bytedeco.tritonserver.tritondevelopertoolsserver;
   exports org.bytedeco.tritonserver.tritonserver;
 }