From b97efba7e82e97c39f7196b666aea6299946d4f4 Mon Sep 17 00:00:00 2001
From: Anastasiia Pnevskaia <anastasiia.pnevskaia@intel.com>
Date: Wed, 28 Feb 2024 10:32:16 +0100
Subject: [PATCH 1/7] Added Telemetry event.
---
optimum/intel/utils/import_utils.py | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/optimum/intel/utils/import_utils.py b/optimum/intel/utils/import_utils.py
index f1fb486c4f..d69b6e5ccb 100644
--- a/optimum/intel/utils/import_utils.py
+++ b/optimum/intel/utils/import_utils.py
@@ -74,6 +74,14 @@
if _openvino_available:
try:
from openvino.runtime import get_version
+ import openvino_telemetry as tm
+ tm = tm.Telemetry(tid="G-W5E9RNLD4H",
+ app_name="Optimum Intel",
+ app_version=importlib_metadata.version("optimum"),
+ backend='ga4',
+ enable_opt_in_dialog=False,
+ disable_in_ci=True)
+ tm.send_event("optimum_intel", "usage", "Openvino was imported.")
version = get_version()
# avoid invalid format
From bdef2b1dd3d4320bc20e9dc54dacb777fcf3ea81 Mon Sep 17 00:00:00 2001
From: Anastasiia Pnevskaia <anastasiia.pnevskaia@intel.com>
Date: Wed, 28 Feb 2024 10:56:17 +0100
Subject: [PATCH 2/7] Added CI check.
---
optimum/intel/utils/import_utils.py | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/optimum/intel/utils/import_utils.py b/optimum/intel/utils/import_utils.py
index d69b6e5ccb..008a5fb39a 100644
--- a/optimum/intel/utils/import_utils.py
+++ b/optimum/intel/utils/import_utils.py
@@ -75,13 +75,19 @@
try:
from openvino.runtime import get_version
import openvino_telemetry as tm
+
tm = tm.Telemetry(tid="G-W5E9RNLD4H",
app_name="Optimum Intel",
- app_version=importlib_metadata.version("optimum"),
+ app_version=get_version(),
backend='ga4',
enable_opt_in_dialog=False,
disable_in_ci=True)
- tm.send_event("optimum_intel", "usage", "Openvino was imported.")
+ tm.send_event("optimum_intel", "openvino_imported", "OpenVino {}, Optimum {}.".format(get_version(), importlib_metadata.version("optimum")))
+
+ # temporal code to check that "CI" variable is set in CI pipelines,
+ # needs to be removed before merge
+ import os
+ assert "CI" in os.environ and os.environ["CI"].lower() == "true"
version = get_version()
# avoid invalid format
From af516684882ebe950d5e44a0f89ae1b50566945e Mon Sep 17 00:00:00 2001
From: Anastasiia Pnevskaia <anastasiia.pnevskaia@intel.com>
Date: Wed, 28 Feb 2024 11:13:48 +0100
Subject: [PATCH 3/7] Minor correction.
---
optimum/intel/utils/import_utils.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/optimum/intel/utils/import_utils.py b/optimum/intel/utils/import_utils.py
index 008a5fb39a..57aec4f3bf 100644
--- a/optimum/intel/utils/import_utils.py
+++ b/optimum/intel/utils/import_utils.py
@@ -82,13 +82,14 @@
backend='ga4',
enable_opt_in_dialog=False,
disable_in_ci=True)
- tm.send_event("optimum_intel", "openvino_imported", "OpenVino {}, Optimum {}.".format(get_version(), importlib_metadata.version("optimum")))
# temporal code to check that "CI" variable is set in CI pipelines,
# needs to be removed before merge
import os
assert "CI" in os.environ and os.environ["CI"].lower() == "true"
+ tm.send_event("optimum_intel", "openvino_imported", "OpenVino {}, Optimum {}.".format(get_version(), importlib_metadata.version("optimum")))
+
version = get_version()
# avoid invalid format
if "-" in version:
From 8cab6bd373c7a6359ed6d4d3422d7ae582d802a4 Mon Sep 17 00:00:00 2001
From: Anastasiia Pnevskaia <anastasiia.pnevskaia@intel.com>
Date: Wed, 28 Feb 2024 14:00:25 +0100
Subject: [PATCH 4/7] CI var pass to docker.
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 90a2827bed..866ae82ea0 100644
--- a/Makefile
+++ b/Makefile
@@ -51,7 +51,7 @@ build_doc_docker_image:
doc: build_doc_docker_image
@test -n "$(BUILD_DIR)" || (echo "BUILD_DIR is empty." ; exit 1)
@test -n "$(VERSION)" || (echo "VERSION is empty." ; exit 1)
- docker run -v $(CURRENT_DIR):/doc_folder --workdir=/doc_folder doc_maker \
+ docker run -v $(CURRENT_DIR):/doc_folder --workdir=/doc_folder --env CI=$(CI) doc_maker \
doc-builder build optimum.intel /optimum-intel/docs/source/ \
--repo_name optimum-intel \
--build_dir $(BUILD_DIR) \
From 475f43d58feb02cb3da5ac5ce80beff2e52c4ca3 Mon Sep 17 00:00:00 2001
From: Anastasiia Pnevskaia <anastasiia.pnevskaia@intel.com>
Date: Thu, 29 Feb 2024 10:25:27 +0100
Subject: [PATCH 5/7] Code style.
---
optimum/intel/utils/import_utils.py | 27 ++++++++++++++-------------
1 file changed, 14 insertions(+), 13 deletions(-)
diff --git a/optimum/intel/utils/import_utils.py b/optimum/intel/utils/import_utils.py
index 57aec4f3bf..efd528eaa5 100644
--- a/optimum/intel/utils/import_utils.py
+++ b/optimum/intel/utils/import_utils.py
@@ -73,22 +73,23 @@
_openvino_version = "N/A"
if _openvino_available:
try:
- from openvino.runtime import get_version
import openvino_telemetry as tm
+ from openvino.runtime import get_version
- tm = tm.Telemetry(tid="G-W5E9RNLD4H",
- app_name="Optimum Intel",
- app_version=get_version(),
- backend='ga4',
- enable_opt_in_dialog=False,
- disable_in_ci=True)
-
- # temporal code to check that "CI" variable is set in CI pipelines,
- # needs to be removed before merge
- import os
- assert "CI" in os.environ and os.environ["CI"].lower() == "true"
+ tm = tm.Telemetry(
+ tid="G-W5E9RNLD4H",
+ app_name="Optimum Intel",
+ app_version=get_version(),
+ backend="ga4",
+ enable_opt_in_dialog=False,
+ disable_in_ci=True,
+ )
- tm.send_event("optimum_intel", "openvino_imported", "OpenVino {}, Optimum {}.".format(get_version(), importlib_metadata.version("optimum")))
+ tm.send_event(
+ "optimum_intel",
+ "openvino_imported",
+ "OpenVino {}, Optimum {}.".format(get_version(), importlib_metadata.version("optimum")),
+ )
version = get_version()
# avoid invalid format
From ee086fb22d89e43a746267850f848e93b38024cc Mon Sep 17 00:00:00 2001
From: Anastasiia Pnevskaia <anastasiia.pnevskaia@intel.com>
Date: Thu, 29 Feb 2024 12:35:01 +0100
Subject: [PATCH 6/7] Added message to readme.
---
README.md | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/README.md b/README.md
index 7b762cce26..343e68289a 100644
--- a/README.md
+++ b/README.md
@@ -201,6 +201,13 @@ Quantization aware training (QAT) is applied in order to simulate the effects of
You can find more examples in the [documentation](https://huggingface.co/docs/optimum/intel/index).
+#### Telemetry
+OpenVINO™ collects software performance and usage data for the purpose of improving OpenVINO™ tools. This data is collected directly by OpenVINO™ or through the use of Google Analytics 4.
+You can opt-out at any time by running the command:
+
+``` bash
+opt_in_out --opt_out
+```
## Running the examples
From 416222b7316c48f11ea871c1556c4d2e44072c7d Mon Sep 17 00:00:00 2001
From: Anastasiia Pnevskaia <anastasiia.pnevskaia@intel.com>
Date: Fri, 1 Mar 2024 10:34:34 +0100
Subject: [PATCH 7/7] Added try-except.
---
optimum/intel/utils/import_utils.py | 34 ++++++++++++++++-------------
1 file changed, 19 insertions(+), 15 deletions(-)
diff --git a/optimum/intel/utils/import_utils.py b/optimum/intel/utils/import_utils.py
index efd528eaa5..23669c46d2 100644
--- a/optimum/intel/utils/import_utils.py
+++ b/optimum/intel/utils/import_utils.py
@@ -73,23 +73,27 @@
_openvino_version = "N/A"
if _openvino_available:
try:
- import openvino_telemetry as tm
from openvino.runtime import get_version
- tm = tm.Telemetry(
- tid="G-W5E9RNLD4H",
- app_name="Optimum Intel",
- app_version=get_version(),
- backend="ga4",
- enable_opt_in_dialog=False,
- disable_in_ci=True,
- )
-
- tm.send_event(
- "optimum_intel",
- "openvino_imported",
- "OpenVino {}, Optimum {}.".format(get_version(), importlib_metadata.version("optimum")),
- )
+ try:
+ import openvino_telemetry as tm
+
+ tm = tm.Telemetry(
+ tid="G-W5E9RNLD4H",
+ app_name="Optimum Intel",
+ app_version=get_version(),
+ backend="ga4",
+ enable_opt_in_dialog=False,
+ disable_in_ci=True,
+ )
+
+ tm.send_event(
+ "optimum_intel",
+ "openvino_imported",
+ "OpenVino {}, Optimum {}.".format(get_version(), importlib_metadata.version("optimum")),
+ )
+ except ImportError:
+ pass
version = get_version()
# avoid invalid format