Skip to content

Commit

Permalink
Merge branch 'github_actions/self_hosted_linux_all' of https://github…
Browse files Browse the repository at this point in the history
….com/mryzhov/openvino into github_actions/self_hosted_linux_all
  • Loading branch information
mryzhov committed Sep 28, 2023
2 parents 29d62dc + 16694d3 commit 83de404
Show file tree
Hide file tree
Showing 52 changed files with 675 additions and 689 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/android_arm64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,15 @@ jobs:
OPENVINO_REPO: '/__w/openvino/openvino/openvino'
VCPKG_ROOT: '/__w/openvino/openvino/vcpkg'
BUILD_DIR: '/__w/openvino/openvino/build'
INSTALL_DIR: '/__w/openvino/openvino/install'
ANDROID_TOOLS: '/__w/openvino/openvino/android_tools'
ANDROID_NDK_HOME: '/__w/openvino/openvino/android_tools/ndk-bundle'
ANDROID_SDK_VERSION: 29
ANDROID_ABI_CONFIG: arm64-v8a
VCPKG_DEFAULT_BINARY_CACHE: '/mount/caches/ccache/android_arm64/vcpkg_cache'
VCPKG_FORCE_SYSTEM_BINARIES: '1'
CCACHE_DIR: '/mount/caches/ccache/android_arm64'
CCACHE_TEMPDIR: '/__w/openvino/openvino/ccache_temp'
CCACHE_COMPILERCHECK: 'content'
CCACHE_MAXSIZE: 50G
steps:
- name: Install git
Expand Down Expand Up @@ -106,6 +108,7 @@ jobs:

- name: Build vcpkg
run: |
mkdir -p ${VCPKG_DEFAULT_BINARY_CACHE}
${VCPKG_ROOT}/bootstrap-vcpkg.sh
# patch vcpkg default toolchain to build only Release configuration
echo "set(VCPKG_BUILD_TYPE release)" >> ${VCPKG_ROOT}/triplets/arm64-android.cmake
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/build_doc.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
name: Documentation
on:
pull_request:
push:
branches:
- 'master'
- 'releases/**'

env:
DOXY_VER: '1.9.6'
Expand Down
25 changes: 16 additions & 9 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -894,15 +894,22 @@ jobs:
defaults:
run:
shell: bash
runs-on: ${{ github.event_name == 'schedule' && 'ubuntu-20.04-8-cores' || 'ubuntu-20.04'}}
runs-on: ${{ github.event_name == 'schedule' && 'aks-linux-16-cores' || 'aks-linux-4-cores'}}
container:
image: openvinogithubactions.azurecr.io/dockerhub/ubuntu:20.04
volumes:
- /mount/caches:/mount/caches
env:
INSTALL_DIR: ${{ github.workspace }}/install
INSTALL_TEST_DIR: ${{ github.workspace }}/install/tests
MODEL_HUB_TESTS_INSTALL_DIR: ${{ github.workspace }}/install/tests/model_hub_tests

steps:
- name: Create Directories
run: mkdir -p ${{ env.INSTALL_DIR }} ${{ env.INSTALL_TEST_DIR }}
run: mkdir -p ${INSTALL_DIR} ${INSTALL_TEST_DIR}

- name: Install 'actions/setup-python@v4' dependencies
run: apt-get update && apt-get install -y libssl1.1 ca-certificates

- uses: actions/setup-python@v4
with:
Expand All @@ -922,25 +929,25 @@ jobs:

- name: Extract OpenVINO packages
run: |
pushd ${{ env.INSTALL_DIR }}
tar -xzf openvino_package.tar.gz -C ${{ env.INSTALL_DIR }} && rm openvino_package.tar.gz || exit 1
pushd ${INSTALL_DIR}
tar -xzf openvino_package.tar.gz -C ${INSTALL_DIR} && rm openvino_package.tar.gz || exit 1
popd
pushd ${{ env.INSTALL_TEST_DIR }}
tar -xzf openvino_tests.tar.gz -C ${{ env.INSTALL_DIR }} && rm openvino_tests.tar.gz || exit 1
pushd ${INSTALL_TEST_DIR}
tar -xzf openvino_tests.tar.gz -C ${INSTALL_DIR} && rm openvino_tests.tar.gz || exit 1
popd
- name: Install OpenVINO Python wheels
run: python3 -m pip install ${INSTALL_DIR}/tools/openvino-*

- name: Install TF Hub tests requirements
run: |
python3 -m pip install -r ${{ env.MODEL_HUB_TESTS_INSTALL_DIR }}/tf_hub_tests/requirements.txt
python3 -m pip install -r ${MODEL_HUB_TESTS_INSTALL_DIR}/tf_hub_tests/requirements.txt
- name: TensorFlow Hub Tests - TF FE
run: |
export PYTHONPATH=${{ env.MODEL_HUB_TESTS_INSTALL_DIR }}:$PYTHONPATH
python3 -m pytest ${{ env.MODEL_HUB_TESTS_INSTALL_DIR }}/tf_hub_tests/ -m ${{ env.TYPE }} --html=${{ env.INSTALL_TEST_DIR }}/TEST-tf_hub_tf_fe.html --self-contained-html
export PYTHONPATH=${MODEL_HUB_TESTS_INSTALL_DIR}:$PYTHONPATH
python3 -m pytest ${MODEL_HUB_TESTS_INSTALL_DIR}/tf_hub_tests/ -m ${TYPE} --html=${INSTALL_TEST_DIR}/TEST-tf_hub_tf_fe.html --self-contained-html -v
env:
TYPE: ${{ github.event_name == 'schedule' && 'nightly' || 'precommit'}}
TEST_DEVICE: CPU
Expand Down
4 changes: 2 additions & 2 deletions docs/articles_en/about_openvino/release_notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@

.. raw:: html

<meta http-equiv="Refresh" content="0; url='https://www.intel.com/content/www/us/en/developer/articles/release-notes/openvino/2023-0.html'" />
<meta http-equiv="Refresh" content="0; url='https://www.intel.com/content/www/us/en/developer/articles/release-notes/openvino/2023-1.html'" />


.. toctree::
:hidden:

prerelease_information

The official OpenVINO Release Notes are published at `www.intel.com <https://www.intel.com/content/www/us/en/developer/articles/release-notes/openvino/2023-0.html>`__
The official OpenVINO Release Notes are published at `www.intel.com <https://www.intel.com/content/www/us/en/developer/articles/release-notes/openvino/2023-1.html>`__


@endsphinxdirective
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
9 changes: 9 additions & 0 deletions src/core/dev_api/validation_util.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,14 @@ OPENVINO_API int64_t clip(const int64_t& value, const int64_t& min, const int64_
///
/// \return Constant node or nullptr if unable to constantfold the subgraph
OPENVINO_API std::shared_ptr<op::v0::Constant> constantfold_subgraph(const Output<Node>& subgraph_sink);

/**
* @brief Runs an estimation of source tensor. If it succeeded to calculate both bounds and
* they are the same returns Constant operation from the resulting bound, otherwise nullptr.
*
* @param source Node output used to get its tensor data as constant.
* @return Shared pointer to constant data or nullptr.
*/
OPENVINO_API std::shared_ptr<op::v0::Constant> get_constant_from_source(const Output<Node>& source);
} // namespace util
} // namespace ov
4 changes: 1 addition & 3 deletions src/core/include/openvino/op/reduce_max.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,7 @@ class OPENVINO_API ReduceMax : public util::ArithmeticReductionKeepDims {

std::shared_ptr<Node> clone_with_new_inputs(const OutputVector& new_args) const override;

OPENVINO_SUPPRESS_DEPRECATED_START
bool evaluate(const HostTensorVector& outputs, const HostTensorVector& inputs) const override;
OPENVINO_SUPPRESS_DEPRECATED_END
bool evaluate(TensorVector& outputs, const TensorVector& inputs) const override;
bool has_evaluate() const override;
bool evaluate_lower(TensorVector& outputs) const override;
bool evaluate_upper(TensorVector& outputs) const override;
Expand Down
4 changes: 1 addition & 3 deletions src/core/include/openvino/op/reduce_mean.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@ class OPENVINO_API ReduceMean : public util::ArithmeticReductionKeepDims {

std::shared_ptr<Node> clone_with_new_inputs(const OutputVector& new_args) const override;

OPENVINO_SUPPRESS_DEPRECATED_START
bool evaluate(const HostTensorVector& outputs, const HostTensorVector& inputs) const override;
OPENVINO_SUPPRESS_DEPRECATED_END
bool evaluate(TensorVector& outputs, const TensorVector& inputs) const override;
bool has_evaluate() const override;
};
} // namespace v1
Expand Down
4 changes: 1 addition & 3 deletions src/core/include/openvino/op/reduce_min.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,7 @@ class OPENVINO_API ReduceMin : public util::ArithmeticReductionKeepDims {

std::shared_ptr<Node> clone_with_new_inputs(const OutputVector& new_args) const override;

OPENVINO_SUPPRESS_DEPRECATED_START
bool evaluate(const HostTensorVector& outputs, const HostTensorVector& inputs) const override;
OPENVINO_SUPPRESS_DEPRECATED_END
bool evaluate(TensorVector& outputs, const TensorVector& inputs) const override;
bool has_evaluate() const override;
bool evaluate_lower(TensorVector& outputs) const override;
bool evaluate_upper(TensorVector& outputs) const override;
Expand Down
4 changes: 1 addition & 3 deletions src/core/include/openvino/op/reduce_prod.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,7 @@ class OPENVINO_API ReduceProd : public util::ArithmeticReductionKeepDims {

std::shared_ptr<Node> clone_with_new_inputs(const OutputVector& new_args) const override;

OPENVINO_SUPPRESS_DEPRECATED_START
bool evaluate(const HostTensorVector& outputs, const HostTensorVector& inputs) const override;
OPENVINO_SUPPRESS_DEPRECATED_END
bool evaluate(TensorVector& outputs, const TensorVector& inputs) const override;
bool has_evaluate() const override;
bool evaluate_lower(TensorVector& outputs) const override;
bool evaluate_upper(TensorVector& outputs) const override;
Expand Down
4 changes: 1 addition & 3 deletions src/core/include/openvino/op/reduce_sum.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,7 @@ class OPENVINO_API ReduceSum : public util::ArithmeticReductionKeepDims {

std::shared_ptr<Node> clone_with_new_inputs(const OutputVector& new_args) const override;

OPENVINO_SUPPRESS_DEPRECATED_START
bool evaluate(const HostTensorVector& outputs, const HostTensorVector& inputs) const override;
OPENVINO_SUPPRESS_DEPRECATED_END
bool evaluate(TensorVector& outputs, const TensorVector& inputs) const override;
bool has_evaluate() const override;
};
} // namespace v1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
#include <numeric>

#include "openvino/core/shape.hpp"
#include "openvino/reference/mean.hpp"
#include "openvino/reference/sum.hpp"
#include "openvino/reference/reduce_mean.hpp"
#include "openvino/reference/reduce_sum.hpp"

namespace ov {
namespace reference {
Expand Down Expand Up @@ -38,11 +38,11 @@ void group_normalization(const T* const data,
const auto group_begin = data + n * batch_size + g * group_size;
const auto group_end = group_begin + group_size;
std::vector<T> mean_value(1);
mean(group_begin, mean_value.data(), Shape{group_size}, {0});
reduce_mean(group_begin, mean_value.data(), Shape{group_size}, {0});
T mean = mean_value[0];
T variance = 0, err = 0;
for_each(group_begin, group_end, [&](const T d) {
return details::kahan_summation(static_cast<T>(pow(d - mean, 2)), err, variance);
variance = details::kahan_summation(static_cast<T>(pow(d - mean, 2)), variance, err);
});
variance /= group_size;
const T standard_deviation = sqrt(variance + eps);
Expand Down
8 changes: 4 additions & 4 deletions src/core/reference/include/openvino/reference/log_softmax.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
#include <cmath>

#include "ngraph/shape_util.hpp"
#include "openvino/reference/max.hpp"
#include "openvino/reference/sum.hpp"
#include "openvino/reference/reduce_max.hpp"
#include "openvino/reference/reduce_sum.hpp"
#include "openvino/reference/utils/coordinate_transform.hpp"

namespace ov {
Expand All @@ -21,7 +21,7 @@ void log_softmax(const T* arg, T* out, const Shape& shape, const AxisSet& axes)
auto temp_max = std::vector<T>(temp_elements, 0);
auto temp_sum = std::vector<T>(temp_elements, 0);

max(arg, temp_max.data(), shape, axes);
reduce_max(arg, temp_max.data(), shape, axes);

CoordinateTransform transform(shape);
CoordinateTransform temp_transform(temp_shape);
Expand All @@ -31,7 +31,7 @@ void log_softmax(const T* arg, T* out, const Shape& shape, const AxisSet& axes)
static_cast<T>(std::exp(arg[transform.index(coord)] - temp_max[temp_transform.index(temp_coord)]));
}

sum(out, temp_sum.data(), shape, axes);
reduce_sum(out, temp_sum.data(), shape, axes);

for (const Coordinate& coord : transform) {
Coordinate temp_coord = ngraph::reduce(coord, axes, true);
Expand Down
46 changes: 0 additions & 46 deletions src/core/reference/include/openvino/reference/max.hpp

This file was deleted.

58 changes: 0 additions & 58 deletions src/core/reference/include/openvino/reference/mean.hpp

This file was deleted.

51 changes: 0 additions & 51 deletions src/core/reference/include/openvino/reference/min.hpp

This file was deleted.

Loading

0 comments on commit 83de404

Please sign in to comment.