Feat/update oneml

Author: Peeranat Fupongsiripan

.gitlab-ci.yml

@@ -4,9 +4,9 @@ image:
 
 variables:
  ONEML_PATH: sertiscorp/mle/edge/oneml
- ONEML_REF: v3.11.1 # a tag or branch name to get oneML artifacts from
+ ONEML_REF: v4.5.0 # a tag or branch name to get oneML artifacts from
  ONEML_COMMIT_HASH: "" # needed only if ONEML_REF is not a tag
- BOOTCAMP_TAG: v0.10.1 # set manually to the latest or new oneML-bootcamp tag
+ BOOTCAMP_TAG: v0.11.0-rc.0 # set manually to the latest or new oneML-bootcamp tag
  RELEASE_BODY: "" # generated automatically
  PRERELEASE: "true" # set automatically
  BOOTCAMP_REF: develop # set automatically
@@ -199,13 +199,13 @@ create-release:
  - if [[ $ONEML_REF == v* ]]; then ONEML_POSTFIX=${ONEML_REF}; else ONEML_POSTFIX=${ONEML_COMMIT_HASH:0:7}; fi
  - >
  BINARIES="";
- BINARIES="${BINARIES} oneml-bootcamp-x86_64-$ONEML_POSTFIX.tar.gz";
- BINARIES="${BINARIES} oneml-bootcamp_tvm-x86_64-$ONEML_POSTFIX.tar.gz";
- BINARIES="${BINARIES} oneml-bootcamp-msvc-x64-$ONEML_POSTFIX.tar.gz";
- BINARIES="${BINARIES} oneml-bootcamp_android-aarch64-linux-android-$ONEML_POSTFIX.tar.gz";
- BINARIES="${BINARIES} oneml-bootcamp_android-arm-linux-android-$ONEML_POSTFIX.tar.gz";
- BINARIES="${BINARIES} oneml-bootcamp-aarch64-linux-gnu-$ONEML_POSTFIX.tar.gz";
- BINARIES="${BINARIES} oneml-bootcamp-arm-linux-gnueabihf-$ONEML_POSTFIX.tar.gz";
+ BINARIES="${BINARIES} oneml-bootcamp-cpu-x86_64-$ONEML_POSTFIX.tar.gz";
+ BINARIES="${BINARIES} oneml-bootcamp-cuda-x86_64-$ONEML_POSTFIX.tar.gz";
+ BINARIES="${BINARIES} oneml-bootcamp-cpu-msvc-x64-$ONEML_POSTFIX.tar.gz";
+ BINARIES="${BINARIES} oneml-bootcamp-android-aarch64-linux-android-$ONEML_POSTFIX.tar.gz";
+ BINARIES="${BINARIES} oneml-bootcamp-android-arm-linux-android-$ONEML_POSTFIX.tar.gz";
+ BINARIES="${BINARIES} oneml-bootcamp-cpu-aarch64-linux-gnu-$ONEML_POSTFIX.tar.gz";
+ BINARIES="${BINARIES} oneml-bootcamp-cpu-arm-linux-gnueabihf-$ONEML_POSTFIX.tar.gz";
  export BINARIES=${BINARIES};
  LABELS="";
  LABELS="${LABELS} oneml-bootcamp-x86_64.tar.gz";

README.md

@@ -356,7 +356,14 @@ user has to rely on their own local environment and make sure all the dependenci
 before proceeding with the build process and run the applications.
 
 #### Requirements
-Only Windows 10 64 bit is currently supported.
+- Only Windows 10 64 bit is currently supported.
+- Windows users are required to set an environment variable to configure the trust store for SSL certificates. More [here](https://github.com/googleapis/google-cloud-cpp/tree/main/google/cloud/bigquery/quickstart#window).
+```
+@powershell -NoProfile -ExecutionPolicy unrestricted -Command ^
+ (new-object System.Net.WebClient).Downloadfile( ^
+ 'https://pki.google.com/roots.pem', 'roots.pem')
+set GRPC_DEFAULT_SSL_ROOTS_FILE_PATH=%cd%\roots.pem
+```
 
 #### Dependencies
 The following dependencies must be installed in order for the project to build and run

apps/android-simple/app/src/main/java/com/sertiscorp/oneml/onemlsimpleapp/MainActivity.java

@@ -167,7 +167,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
  FaceDetectorResult detectionResult = results.get(i);
  if (detectionResult.getSize() > 0) {
  BBoxList bboxes = detectionResult.getBBoxes();
- ScoreList scores = detectionResult.getScores();
+ FloatList scores = detectionResult.getScores();
  Landmark5List landmarks = detectionResult.getLandmarks();
 
  Log.d(TAG, String.format("Found %d faces", bboxes.size()));
@@ -214,7 +214,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
 
  if (detectionResult.getBBoxes().size() > 0) {
  BBoxList bboxes = detectionResult.getBBoxes();
- ScoreList scores = detectionResult.getScores();
+ FloatList scores = detectionResult.getScores();
  Landmark5List landmarks = detectionResult.getLandmarks();
 
  Log.d(TAG, String.format("Found %d faces", bboxes.size()));

apps/android-simple/app/src/main/java/com/sertiscorp/oneml/onemlsimpleapp/OneMLApiFactory.java

@@ -22,10 +22,11 @@ private static LicenseManager createLicenseManager(){
  }else{
  manager.activateTrial();
  }
+ boolean valid = manager.validateActivation() == LicenseStatus.Ok;
  Log.d(TAG, "license: machine_code=" + manager.getMachineCode());
- Log.d(TAG, "license: valid_activation=" + manager.isValidActivation());
+ Log.d(TAG, "license: valid_activation=" + valid);
  Log.d(TAG, "license: activation_type=" + manager.getActivationType());
- if (manager.isValidActivation()){
+ if (valid){
  Log.d(TAG, "license: expiry_date=" + manager.getActivationExpiryDate());
  }
  return manager;

apps/cpp/ekyc.cc

@@ -27,7 +27,7 @@ int main(int argc, char** argv) {
 
  // RUN
  oneML::face::EKYCResult output;
- oneML::face::EKYCOps ops{true, true};
+ oneML::face::EKYCOps ops{true};
  ekyc.run(img1, img2, ops, ops, output);
 
  oneML::face::Pose pose1;
@@ -56,6 +56,4 @@ int main(int argc, char** argv) {
  std::cout << "Pose: " << pose2 << std::endl;
  std::cout << "Landmarks: " << landmarks2 << std::endl;
 
- oneML::UsageReport report = ekyc.get_usage();
- report.to_log();
 }

apps/cpp/face_detector.cc

@@ -50,6 +50,4 @@ int main(int argc, char** argv) {
  }
  }
 
- oneML::UsageReport report = detector.get_usage();
- report.to_log();
 }

apps/cpp/face_embedder.cc

@@ -36,6 +36,4 @@ int main(int argc, char** argv) {
  std::cout << "Embedding sum: " << std::fixed << std::setprecision(5)
  << std::accumulate(emb.begin(), emb.end(), decltype(emb)::value_type(0)) << std::endl;
 
- oneML::UsageReport report = embedder.get_usage();
- report.to_log();
 }

apps/cpp/face_id.cc

@@ -105,6 +105,4 @@ int main(int argc, char** argv) {
  face_id.get_ids(ids);
  std::cout << "Gallery size: " << ids.size() << std::endl;
 
- oneML::UsageReport report = face_id.get_usage();
- report.to_log();
 }

apps/cpp/face_pad.cc

@@ -32,9 +32,6 @@ int main(int argc, char** argv) {
  << output.get_spoof_prob() << std::endl;
  std::cout << "Spoof classification: " << output.is_spoof() << std::endl;
 
- oneML::UsageReport report = pad_rgb.get_usage();
- report.to_log();
-
  // PAD PAPER
  path = ASSETS_DIR_PATH "/pad-paper-set/spoof/1.jpg";
  utils.read_image_cv(path, img);
@@ -47,6 +44,4 @@ int main(int argc, char** argv) {
  << output.get_spoof_prob() << std::endl;
  std::cout << "Spoof classification: " << output.is_spoof() << std::endl;
 
- report = pad_paper.get_usage();
- report.to_log();
 }

apps/cpp/face_verification.cc

@@ -85,9 +85,4 @@ int main(int argc, char** argv) {
  std::pair<oneML::ReturnStatus, bool> is_same2 = face_id.is_the_same_person(img3, img4);
  std::cout << "Is the same person (george_robertson): " << is_same2.second << std::endl;
 
- oneML::UsageReport report = detector.get_usage();
- report.to_log();
-
- report = face_id.get_usage();
- report.to_log();
 }