Sync with r2.11.1 (#1393)

* add Max devcatalog and change flex link (#1179) * add Max devcatalog and change flex link * add precision list * remove video groups (#1197) Co-authored-by: Jitendra Patil <jitendra.patil@intel.com> * source env vars and remove video grps (#1203) Co-authored-by: Jitendra Patil <jitendra.patil@intel.com> * remove video grps pvc (#1213) Co-authored-by: Jitendra Patil <jitendra.patil@intel.com> * update driver links,paths and remove dataset coco.names (#1230) * update driver links in devcatalog * update code to include coco files mount --------- Co-authored-by: hanchao <chao1.han@intel.com> * Container automation (#1292) MZ containers build & test automation using compose & test runner. * add preprocess coco (#1299) * add yolov4 env changes (#1300) * Fix frozen graph for flex series * Added tests for m1 and m3 * Clean up files for release (#1341) * update devcatalog landing page * remove build and multicard devcatalog pyt * remove build and multi-card devcatalogs * restore deleted file * Fixing Lint and Unit tests (#1344) Signed-off-by: Abolfazl Shahbazi <abolfazl.shahbazi@intel.com> * PVC bert-large inference modification (#1332) * change paths and avoid re-download * Add scanner workflows * Synced with develop (#1348) * Upgrade transformers version to fix CVEs (#1355) * Dataset_librarian code updates (#1187) * Changed location of installation of GCP cli * Adding packaging tests * Interconnection experiment * Test updated workflow * Fixed out_report.xml path * Interconnection for GCP * Adding updates for wheel and setuptools * Experiment requirements * Changes to ignore copied files * Adding fix to handle encoding issues * Adding changes to readme * Taking current folder to get packages * Fix typo Signed-off-by: Felipe Leza Alvarez <109559376+flezaalv@users.noreply.github.com> * Inter connection sample * Hot fix for python 3.8 * Fix for setup code * ignoring sample file * Renaming correctly interconnection * Fix on upgrade for pip, wheel and setuptools * Interoperability POC sample fix * Fix for .sample copy * Setup for bash * Hotfix: change "test" strings for "test_unittest" so that unit tests won't use files used by samples. * Fixing requirements and setup * Removing wheel update from setup * Fixes the problem to upload dataset to GCP. * Fixed unwanted changes on main branch * Fixed aws functional test name * Upload a folder using the aws connector * Last changes on Interoperability are applied * Updated Licence * Removinb code of conduct reference, we have not * Skips row 0 from excel when creating dataframe. * Refactor * delete unused gitignore * change access keys format * Refactored names * first version license header * Remoivng readme files on this branch * Deleting files created from setup * Adding headers into main packages * Adding headers on sample code * Updating files for publishing * Get GCP credentials * Changed setup.sh file * Removed init file on interoperability folder * Big refactoring, moving data_connector into datasets * Complete sample link * Test WF * Fixed path for unit tests * Changed trigger to PR * Create sample link * Merging readmes * Removing licence only for data connector * Missed recursive flag * delete unused names * Ignore outputs of jupyter notebook * Removing commented block * Removing deprecated folder * Include headers in init files * Adding headers in all tests * Removing coverage omit from tox configuration file (This only works on MZ env) * Removed gcp auth commands instead of commenting them * Adding headers * Removed sensitive information on gcp * Solving names to public repo * Removing sample values * Fixing path on script * Removing extra files * add security file * Updating files and structure for publishing * Updates for packaging * Updating readme * Updating metadata * Updating source code * Updating gitgitnore * removing extracted files * Updating repo * removing dataset egg info * Updating file permissions * removing key * Updating imports * Removing error * removing data_connector changes * Updating conda recipes * Fixed bugs in setup.sh Added azure src and dependencies. * Removing conda folders * Updating blank space at the end of files * Updating readme * Validation/scans (#56) * Fixed dataset_api requirements file * Merging from data_connector * Updating gitignore * Returning depencencies * Returning training code * Creating and re naming sample files * Adding format * New readme proposals * Fix on toml to avoid refactor * Readme agenda * Conda folder is unevitable * Exclud conda and egg folders * Adding badages in main readme... will see if we should use rst format for main readme only * Simple entry point for sample doc * Change header for sub_linked section * Modifications to current lass invocation * Adding relative link to documentation in AWS main readme file * Terms and conditions requirements update * Changes on Azure Readmi file * Removing previous terms and conditions * Updating path for datasets_urls * Updating path for datasets_urls * Removing data connector changes * Updating blank last line * Updated documentation with curren code functionality * Update documentation * Added code sample for upload, download and list blobs for oauth * first definition on dcp readme for bigquery * Sample connection with oauth * Adding readme sample for gcp service account connection with GCP * Connection documentation finished * Updating TPP file * updating with feedback --------- Signed-off-by: gera-aldama <111396864+gera-aldama@users.noreply.github.com> Signed-off-by: Felipe Leza Alvarez <109559376+flezaalv@users.noreply.github.com> Co-authored-by: Miguel Pineda <miguel.pineda.juarez@intel.com> Co-authored-by: Gerardo Dominguez <gerardo.dominguez.aldama@intel.com> Co-authored-by: gera-aldama <111396864+gera-aldama@users.noreply.github.com> Co-authored-by: Felipe Leza Alvarez <109559376+flezaalv@users.noreply.github.com> Co-authored-by: aagalleg <alberto.gallegos.muro@intel.com> Co-authored-by: Leza Alvarez, Felipe <felipe.leza.alvarez@intel.com> Co-authored-by: ma-pineda <110496466+ma-pineda@users.noreply.github.com> * Feature/aikitpv 828/dataset librarian code refactor (#1273) * Fixing conda recipe syntax error * Updating conda recipe * Data Connector HF for public repo (#1331) * Validation/scans (#56) * Licence and samples (#1350) --------- Signed-off-by: Abolfazl Shahbazi <abolfazl.shahbazi@intel.com> Signed-off-by: gera-aldama <111396864+gera-aldama@users.noreply.github.com> Signed-off-by: Felipe Leza Alvarez <109559376+flezaalv@users.noreply.github.com> Signed-off-by: Felipe Leza Alvarez <felipe.leza.alvarez@intel.com> Co-authored-by: Srikanth Ramakrishna <srikanth.ramakrishna@intel.com> Co-authored-by: Jitendra Patil <jitendra.patil@intel.com> Co-authored-by: hanchao <chao1.han@intel.com> Co-authored-by: mahathis <36486206+Mahathi-Vatsal@users.noreply.github.com> Co-authored-by: lerealno <112975902+lerealno@users.noreply.github.com> Co-authored-by: Abolfazl Shahbazi <abolfazl.shahbazi@intel.com> Co-authored-by: Real Novo, Luis <luis.real.novo@intel.com> Co-authored-by: Jesus Herrera Ledon <110855758+j3su5pro-intel@users.noreply.github.com> Co-authored-by: Miguel Pineda <miguel.pineda.juarez@intel.com> Co-authored-by: Gerardo Dominguez <gerardo.dominguez.aldama@intel.com> Co-authored-by: gera-aldama <111396864+gera-aldama@users.noreply.github.com> Co-authored-by: Felipe Leza Alvarez <109559376+flezaalv@users.noreply.github.com> Co-authored-by: aagalleg <alberto.gallegos.muro@intel.com> Co-authored-by: Leza Alvarez, Felipe <felipe.leza.alvarez@intel.com> Co-authored-by: ma-pineda <110496466+ma-pineda@users.noreply.github.com>
intel · Jul 21, 2023 · 31bf4d4 · 31bf4d4
1 parent 7f3b9f1
commit 31bf4d4
Show file tree

Hide file tree

Showing 252 changed files with 7,206 additions and 2,655 deletions.
diff --git a/.gitignore b/.gitignore
@@ -17,4 +17,4 @@ tools/docker/models*
 .ipynb_checkpoints
 nc_workspace
 benchmarks/horovod
-data_connector/credentials.json
+cloud_data_connector/credentials.json
diff --git a/benchmarks/common/tensorflow/start.sh b/benchmarks/common/tensorflow/start.sh
@@ -1112,7 +1112,7 @@ function ssd_mobilenet() {
       python3 -m pip install $line
     done
   fi
-
+  CMD="${CMD} $(add_steps_args)"
   PYTHONPATH=${PYTHONPATH} CMD=${CMD} run_model
 }
 

diff --git a/benchmarks/object_detection/tensorflow/ssd-mobilenet/inference/int8/model_init.py b/benchmarks/object_detection/tensorflow/ssd-mobilenet/inference/int8/model_init.py
@@ -19,7 +19,7 @@
 #
 
 import os
-
+import argparse
 from common.base_model_init import BaseModelInitializer, set_env_var
 
 
@@ -28,8 +28,22 @@ class ModelInitializer(BaseModelInitializer):
     args = None
     custom_args = []
 
+    def parse_args(self):
+        parser = argparse.ArgumentParser()
+        parser.add_argument(
+            "--warmup-steps", dest="warmup_steps",
+            help="number of warmup steps",
+            type=int, default=10)
+        parser.add_argument(
+            "--steps", dest="steps",
+            help="number of steps",
+            type=int, default=50)
+        self.args = parser.parse_args(self.custom_args,
+                                      namespace=self.args)
+
     def __init__(self, args, custom_args=[], platform_util=None):
         super(ModelInitializer, self).__init__(args, custom_args, platform_util)
+        self.parse_args()
         # Set the num_inter_threads and num_intra_threads
         # if user did not provide then default value based on platform will be set
         self.set_num_inter_intra_threads(self.args.num_inter_threads,
@@ -48,8 +62,8 @@ def __init__(self, args, custom_args=[], platform_util=None):
         set_env_var("OMP_NUM_THREADS", self.args.num_intra_threads)
 
         self.command_prefix += " -g {0}".format(self.args.input_graph)
-        self.command_prefix += " -i 1000"
-        self.command_prefix += " -w 200"
+        self.command_prefix += " -i {0}".format(self.args.steps)
+        self.command_prefix += " -w {0}".format(self.args.warmup_steps)
         self.command_prefix += " -a {0}".format(self.args.num_intra_threads)
         self.command_prefix += " -e {0}".format(self.args.num_inter_threads)
         if self.args.data_location:

diff --git a/datasets/data_connector/.gitignore → datasets/cloud_data_connector/.gitignore b/datasets/data_connector/.gitignore → datasets/cloud_data_connector/.gitignore
@@ -12,9 +12,17 @@ __pycache__/
 .venv
 
 # Folders
-local_channel/
 dist/
 inspect_package-conda/
 inspect_package-pip/
-conda_package/
 build/
+
+# conda
+conda/local-channel/
+conda/local_channel/
+conda/extracted/
+conda/build/
+conda/offline_installer/
+
+# scans
+scans/
diff --git a/datasets/cloud_data_connector/LICENSE b/datasets/cloud_data_connector/LICENSE
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2023 Intel Corporation
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/datasets/data_connector/MANIFEST.in → datasets/cloud_data_connector/MANIFEST.in b/datasets/data_connector/MANIFEST.in → datasets/cloud_data_connector/MANIFEST.in
@@ -3,4 +3,6 @@ prune docker
 prune samples
 prune tests
 prune docs
-exclude *.txt __init__.py .gitignore poetry.lock tox.ini MANIFEST.in
+prune conda
+prune cloud_data_connector.egg-info
+exclude *.txt __init__.py .gitignore poetry.lock tox.ini MANIFEST.in