Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: fix core binding strategies for different cpu topologies #143

Open
wants to merge 16 commits into
base: main
Choose a base branch
from
Open

fix: fix core binding strategies for different cpu topologies #143

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
b63c719
Sync master with r2.8 (#772)
WafaaT Sep 19, 2022
a3f1cd1
Sync master with r2.9 (#858)
WafaaT Nov 17, 2022
59d6cf2
Update Pillow to '>=9.3.0' (#884)
ashahba Dec 9, 2022
d48ffa2
remove supported OS checks (#926)
WafaaT Dec 16, 2022
de7dda4
Remove Linux/windows OS platform support checks (#927)
WafaaT Dec 16, 2022
45372ae
CVE and platform checks fixes (#929)
WafaaT Dec 19, 2022
e0b3415
Merge branch 'master' of github.com:intel-innersource/frameworks.ai.m…
WafaaT Dec 19, 2022
b0884e9
Sync master with r2.10 (#984)
WafaaT Jan 24, 2023
f6bd1ea
Merge branch r2.10 into 'master'
WafaaT Jan 26, 2023
362bd03
sync with r2.10 (#1001)
WafaaT Feb 3, 2023
6e0d82b
set bf32 flag as env var (#1009)
WafaaT Mar 2, 2023
8c4c7c9
upgrade ipython to 8.10.0 to avoid vulnerability (#1024)
WafaaT Feb 28, 2023
accca70
Sync with upstream (#1152)
WafaaT Apr 27, 2023
5d29317
Sync with r2.11 (#1156)
WafaaT Apr 28, 2023
45dfdbe
Fix CVEs and minor doc updates (#1164)
WafaaT May 5, 2023
2b5802c
fix: fix core binding strategies for different cpu topologies
zeroorhero Jun 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
CVE and platform checks fixes (#929) 
* Update Pillow to '>=9.3.0' (#884)

Signed-off-by: Abolfazl Shahbazi <[email protected]>

Signed-off-by: Abolfazl Shahbazi <[email protected]>

* remove supported OS checks (#926)

* Remove Linux/windows OS platform support checks (#927)

* upgrade Pillow version for Yolov4

Signed-off-by: Abolfazl Shahbazi <[email protected]>
Co-authored-by: Abolfazl Shahbazi <[email protected]>
@WafaaT @ashahba
WafaaT and ashahba authored Dec 19, 2022

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
GPG key ID: 4AEE18F83AFDEB23
Expired
Verified
Learn about vigilant mode
commit 45372ae8dc9f0b6026253892e216316b40b62fac
28 changes: 1 addition & 27 deletions benchmarks/common/tensorflow/start.sh
View file
Original file line number Diff line number Diff line change
@@ -94,8 +94,6 @@ if [[ "$unamestr" == 'Linux' ]]; then
PLATFORM='linux'
elif [[ "$unamestr" == "MSYS"* ]]; then
PLATFORM='windows'
else
echo "$unamestr is not supported!"
fi
echo
echo "Running on ${PLATFORM}"
@@ -108,32 +106,8 @@ if [[ ${PLATFORM} == "linux" ]]; then
OS_PLATFORM=$(echo "${OS_PLATFORM#*=}")
OS_VERSION=$(egrep '^(VERSION_ID)=' /etc/os-release)
OS_VERSION=$(echo "${OS_VERSION#*=}")
if [[ ${OS_PLATFORM} == *"CentOS"* ]] || [[ ${OS_PLATFORM} == *"Red Hat"* ]]; then
if [[ ! "${OS_VERSION}" =~ "7".* ]] && [[ ! "${OS_VERSION}" =~ "8".* ]]; then
echo "${OS_PLATFORM} version ${OS_VERSION} is not currently supported."
exit 1
fi
elif [[ ${OS_PLATFORM} == *"Ubuntu"* ]]; then
if [[ ! "${OS_VERSION}" =~ "18.04".* ]] && [[ ! "${OS_VERSION}" =~ "20.04".* ]] && [[ ! "${OS_VERSION}" =~ "22.04".* ]]; then
echo "${OS_PLATFORM} version ${OS_VERSION} is not currently supported."
exit 1
fi
elif [[ ${OS_PLATFORM} == *"Debian"* ]]; then
if [[ ! "${OS_VERSION}" =~ "10".* ]] && [[ ! "${OS_VERSION}" =~ "11".* ]]; then
echo "${OS_PLATFORM} version ${OS_VERSION} is not currently supported."
exit 1
fi
elif [[ ${OS_PLATFORM} == *"SLES"* ]] || [[ ${OS_PLATFORM} == *"SUSE"* ]]; then
if [[ ! "${OS_VERSION}" =~ "15".* ]]; then
echo "${OS_PLATFORM} version ${OS_VERSION} is not currently supported."
exit 1
fi
else
echo "${OS_PLATFORM} version ${OS_VERSION} is not currently supported."
exit 1
fi

echo "Running on ${OS_PLATFORM} version ${OS_VERSION} is supported."
echo "Running on ${OS_PLATFORM} version ${OS_VERSION}"
fi

if [[ ${NOINSTALL} != "True" ]]; then
2 changes: 1 addition & 1 deletion benchmarks/common/tensorflow_serving/start.sh
View file
Original file line number Diff line number Diff line change
@@ -163,7 +163,7 @@ function ssd_mobilenet(){
# Install protofbuf and other requirement
pip install \
Cython \
'pillow>=8.1.2' \
'pillow>=9.3.0' \
absl-py \
contextlib2 \
lxml \
2 changes: 1 addition & 1 deletion benchmarks/image_segmentation/tensorflow/maskrcnn/inference/fp32/README.md
View file
Original file line number Diff line number Diff line change
@@ -59,7 +59,7 @@ using [AI Kit](/docs/general/tensorflow/AIKit.md):
<li>git
<li>wget
<li>IPython[all]
<li>pillow>=8.1.2
<li>pillow>=9.3.0
<li>cython
<li>h5py==2.10.0
<li>imgaug
2 changes: 1 addition & 1 deletion benchmarks/image_segmentation/tensorflow/maskrcnn/inference/fp32/requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pycocotools
numpy
scipy
Pillow>=8.1.2
Pillow>=9.3.0
cython
matplotlib
scikit-image
2 changes: 1 addition & 1 deletion benchmarks/image_segmentation/tensorflow/unet/inference/fp32/README.md
View file
Original file line number Diff line number Diff line change
@@ -36,7 +36,7 @@ using [AI Kit](/docs/general/tensorflow/AIKit.md):
<li><a href="https://pypi.org/project/intel-tensorflow/1.15.2/">intel-tensorflow==1.15.2</a>
<li>numactl
<li>numpy==1.16.3
<li>Pillow>=8.1.2
<li>Pillow>=9.3.0
<li>matplotlib
<li>click
<li>wget
2 changes: 1 addition & 1 deletion benchmarks/image_segmentation/tensorflow/unet/requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
click
numpy>=1.16.3
Pillow>=8.1.2
Pillow>=9.3.0
matplotlib
2 changes: 1 addition & 1 deletion benchmarks/object_detection/tensorflow/faster_rcnn/inference/fp32/README.md
View file
Original file line number Diff line number Diff line change
@@ -53,7 +53,7 @@ using [AI Kit](/docs/general/tensorflow/AIKit.md):
<li>jupyter
<li>lxml
<li>matplotlib
<li>pillow>=8.1.2
<li>pillow>=9.3.0
<li>pycocotools
<li>A clone of the Model Zoo repo<br />
<pre>git clone https://github.com/IntelAI/models.git</pre>
2 changes: 1 addition & 1 deletion benchmarks/object_detection/tensorflow/faster_rcnn/inference/int8/README.md
View file
Original file line number Diff line number Diff line change
@@ -60,7 +60,7 @@ using [AI Kit](/docs/general/tensorflow/AIKit.md):
<li>jupyter
<li>lxml
<li>matplotlib
<li>pillow>=8.1.2
<li>pillow>=9.3.0
<li>pycocotools
<li>A clone of the Model Zoo repo<br />
<pre>git clone https://github.com/IntelAI/models.git</pre>
2 changes: 1 addition & 1 deletion benchmarks/object_detection/tensorflow/faster_rcnn/requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Cython
contextlib2
pillow>=8.1.2
pillow>=9.3.0
lxml
jupyter
matplotlib
6 changes: 3 additions & 3 deletions benchmarks/object_detection/tensorflow/rfcn/inference/fp32/README.md
View file
Original file line number Diff line number Diff line change
@@ -51,7 +51,7 @@ using [AI Kit](/docs/general/tensorflow/AIKit.md):
<li>jupyter
<li>lxml
<li>matplotlib
<li>pillow>=8.1.2
<li>pillow>=9.3.0
<li>protobuf-compiler
<li>pycocotools
<li>Activate the `tensorflow` conda environment
@@ -72,7 +72,7 @@ using [AI Kit](/docs/general/tensorflow/AIKit.md):
<li>jupyter
<li>lxml
<li>matplotlib
<li>pillow>=8.1.2
<li>pillow>=9.3.0
<li>protobuf-compiler
<li>pycocotools
<li>A clone of the Model Zoo repo<br />
@@ -89,7 +89,7 @@ using [AI Kit](/docs/general/tensorflow/AIKit.md):
<li>jupyter
<li>lxml
<li>matplotlib
<li>pillow>=8.1.2
<li>pillow>=9.3.0
<li>protobuf-compiler
<li>pycocotools
<li>A clone of the Model Zoo repo<br />
6 changes: 3 additions & 3 deletions benchmarks/object_detection/tensorflow/rfcn/inference/int8/README.md
View file
Original file line number Diff line number Diff line change
@@ -50,7 +50,7 @@ using [AI Kit](/docs/general/tensorflow/AIKit.md):
<li>jupyter
<li>lxml
<li>matplotlib
<li>pillow>=8.1.2
<li>pillow>=9.3.0
<li>protobuf-compiler
<li>pycocotools
<li>Activate the `tensorflow` conda environment
@@ -71,7 +71,7 @@ using [AI Kit](/docs/general/tensorflow/AIKit.md):
<li>jupyter
<li>lxml
<li>matplotlib
<li>pillow>=8.1.2
<li>pillow>=9.3.0
<li>protobuf-compiler
<li>pycocotools
<li>A clone of the Model Zoo repo<br />
@@ -88,7 +88,7 @@ using [AI Kit](/docs/general/tensorflow/AIKit.md):
<li>jupyter
<li>lxml
<li>matplotlib
<li>pillow>=8.1.2
<li>pillow>=9.3.0
<li>protobuf-compiler
<li>pycocotools
<li>A clone of the Model Zoo repo<br />
2 changes: 1 addition & 1 deletion benchmarks/object_detection/tensorflow/rfcn/requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
numpy>=1.17.4
Cython
contextlib2
pillow>=8.1.2
pillow>=9.3.0
lxml
jupyter
matplotlib
4 changes: 2 additions & 2 deletions benchmarks/object_detection/tensorflow/ssd-mobilenet/inference/bfloat16/README.md
View file
Original file line number Diff line number Diff line change
@@ -49,7 +49,7 @@ using [AI Kit](/docs/general/tensorflow/AIKit.md):
<li>jupyter
<li>lxml
<li>matplotlib
<li>pillow>=8.1.2
<li>pillow>=9.3.0
<li>pycocotools
<li>Activate the `tensorflow` conda environment
<pre>conda activate tensorflow</pre>
@@ -69,7 +69,7 @@ using [AI Kit](/docs/general/tensorflow/AIKit.md):
<li>jupyter
<li>lxml
<li>matplotlib
<li>pillow>=8.1.2
<li>pillow>=9.3.0
<li>pycocotools
<li>A clone of the Model Zoo repo<br />
<pre>git clone https://github.com/IntelAI/models.git</pre>
6 changes: 3 additions & 3 deletions benchmarks/object_detection/tensorflow/ssd-mobilenet/inference/fp32/README.md
View file
Original file line number Diff line number Diff line change
@@ -50,7 +50,7 @@ using [AI Kit](/docs/general/tensorflow/AIKit.md):
<li>jupyter
<li>lxml
<li>matplotlib
<li>pillow>=8.1.2
<li>pillow>=9.3.0
<li>pycocotools
<li>Activate the `tensorflow` conda environment
<pre>conda activate tensorflow</pre>
@@ -70,7 +70,7 @@ using [AI Kit](/docs/general/tensorflow/AIKit.md):
<li>jupyter
<li>lxml
<li>matplotlib
<li>pillow>=8.1.2
<li>pillow>=9.3.0
<li>pycocotools
<li>A clone of the Model Zoo repo<br />
<pre>git clone https://github.com/IntelAI/models.git</pre>
@@ -86,7 +86,7 @@ using [AI Kit](/docs/general/tensorflow/AIKit.md):
<li>jupyter
<li>lxml
<li>matplotlib
<li>pillow>=8.1.2
<li>pillow>=9.3.0
<li>pycocotools
<li>A clone of the Model Zoo repo<br />
<pre>git clone https://github.com/IntelAI/models.git</pre>
6 changes: 3 additions & 3 deletions benchmarks/object_detection/tensorflow/ssd-mobilenet/inference/int8/README.md
View file
Original file line number Diff line number Diff line change
@@ -49,7 +49,7 @@ using [AI Kit](/docs/general/tensorflow/AIKit.md):
<li>jupyter
<li>lxml
<li>matplotlib
<li>pillow>=8.1.2
<li>pillow>=9.3.0
<li>pycocotools
<li>Activate the `tensorflow` conda environment
<pre>conda activate tensorflow</pre>
@@ -69,7 +69,7 @@ using [AI Kit](/docs/general/tensorflow/AIKit.md):
<li>jupyter
<li>lxml
<li>matplotlib
<li>pillow>=8.1.2
<li>pillow>=9.3.0
<li>pycocotools
<li>A clone of the Model Zoo repo<br />
<pre>git clone https://github.com/IntelAI/models.git</pre>
@@ -85,7 +85,7 @@ using [AI Kit](/docs/general/tensorflow/AIKit.md):
<li>jupyter
<li>lxml
<li>matplotlib
<li>pillow>=8.1.2
<li>pillow>=9.3.0
<li>pycocotools
<li>A clone of the Model Zoo repo<br />
<pre>git clone https://github.com/IntelAI/models.git</pre>
2 changes: 1 addition & 1 deletion benchmarks/object_detection/tensorflow/ssd-mobilenet/requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Cython
contextlib2
pillow>=8.1.2
pillow>=9.3.0
lxml
jupyter
matplotlib
4 changes: 2 additions & 2 deletions benchmarks/object_detection/tensorflow/ssd-resnet34/inference/bfloat16/README.md
View file
Original file line number Diff line number Diff line change
@@ -60,7 +60,7 @@ using [AI Kit](/docs/general/tensorflow/AIKit.md):
<li>matplotlib
<li>numpy>=1.17.4
<li>opencv-python
<li>pillow>=8.1.2
<li>pillow>=9.3.0
<li>pycocotools
<li>tensorflow-addons==0.11.0
<li>Activate the tensorflow 2.5.0 conda environment
@@ -87,7 +87,7 @@ using [AI Kit](/docs/general/tensorflow/AIKit.md):
<li>matplotlib
<li>numpy>=1.17.4
<li>opencv-python
<li>pillow>=8.1.2
<li>pillow>=9.3.0
<li>pycocotools
<li>tensorflow-addons==0.11.0
<li>A clone of the Model Zoo repo<br />
6 changes: 3 additions & 3 deletions benchmarks/object_detection/tensorflow/ssd-resnet34/inference/fp32/README.md
View file
Original file line number Diff line number Diff line change
@@ -65,7 +65,7 @@ using [AI Kit](/docs/general/tensorflow/AIKit.md):
<li>matplotlib
<li>numpy>=1.17.4
<li>opencv-python
<li>pillow>=8.1.2
<li>pillow>=9.3.0
<li>pycocotools
<li>tensorflow-addons==0.11.0
<li>Activate the tensorflow 2.5.0 conda environment
@@ -92,7 +92,7 @@ using [AI Kit](/docs/general/tensorflow/AIKit.md):
<li>matplotlib
<li>numpy>=1.17.4
<li>opencv-python
<li>pillow>=8.1.2
<li>pillow>=9.3.0
<li>pycocotools
<li>tensorflow-addons==0.11.0
<li>A clone of the Model Zoo repo<br />
@@ -115,7 +115,7 @@ using [AI Kit](/docs/general/tensorflow/AIKit.md):
<li>matplotlib
<li>numpy>=1.17.4
<li>opencv-python
<li>pillow>=8.1.2
<li>pillow>=9.3.0
<li>pycocotools
<li>tensorflow-addons==0.11.0
<li>A clone of the Model Zoo repo<br />
6 changes: 3 additions & 3 deletions benchmarks/object_detection/tensorflow/ssd-resnet34/inference/int8/README.md
View file
Original file line number Diff line number Diff line change
@@ -67,7 +67,7 @@ using [AI Kit](/docs/general/tensorflow/AIKit.md):
<li>matplotlib
<li>numpy>=1.17.4
<li>opencv-python
<li>pillow>=8.1.2
<li>pillow>=9.3.0
<li>pycocotools
<li>tensorflow-addons==0.11.0
<li>Activate the tensorflow 2.5.0 conda environment
@@ -94,7 +94,7 @@ using [AI Kit](/docs/general/tensorflow/AIKit.md):
<li>matplotlib
<li>numpy>=1.17.4
<li>opencv-python
<li>pillow>=8.1.2
<li>pillow>=9.3.0
<li>pycocotools
<li>tensorflow-addons==0.11.0
<li>A clone of the Model Zoo repo<br />
@@ -117,7 +117,7 @@ using [AI Kit](/docs/general/tensorflow/AIKit.md):
<li>matplotlib
<li>numpy>=1.17.4
<li>opencv-python
<li>pillow>=8.1.2
<li>pillow>=9.3.0
<li>pycocotools
<li>tensorflow-addons==0.11.0
<li>A clone of the Model Zoo repo<br />
2 changes: 1 addition & 1 deletion benchmarks/object_detection/tensorflow/ssd-resnet34/requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
numpy>=1.17.4
Cython
contextlib2
pillow>=8.1.2
pillow>=9.3.0
lxml
jupyter
matplotlib
4 changes: 2 additions & 2 deletions benchmarks/object_detection/tensorflow/ssd-resnet34/training/bfloat16/README.md
View file
Original file line number Diff line number Diff line change
@@ -54,7 +54,7 @@ using [AI Kit](/docs/general/tensorflow/AIKit.md):
<li>opencv-python
<li>openmpi
<li>openssh
<li>pillow>=8.1.2
<li>pillow>=9.3.0
<li>protobuf-compiler
<li>pycocotools
<li>tensorflow-addons==0.11.0
@@ -81,7 +81,7 @@ using [AI Kit](/docs/general/tensorflow/AIKit.md):
<li>opencv-python
<li>openmpi
<li>openssh
<li>pillow>=8.1.2
<li>pillow>=9.3.0
<li>protobuf-compiler
<li>pycocotools
<li>tensorflow-addons==0.11.0
4 changes: 2 additions & 2 deletions benchmarks/object_detection/tensorflow/ssd-resnet34/training/fp32/README.md
View file
Original file line number Diff line number Diff line change
@@ -48,7 +48,7 @@ using [AI Kit](/docs/general/tensorflow/AIKit.md):
<li>opencv
<li>openmpi
<li>openssh
<li>pillow>=8.1.2
<li>pillow>=9.3.0
<li>protoc
<li>pycocotools
<li>tensorflow-addons==0.11.0
@@ -74,7 +74,7 @@ using [AI Kit](/docs/general/tensorflow/AIKit.md):
<li>opencv
<li>openmpi
<li>openssh
<li>pillow>=8.1.2
<li>pillow>=9.3.0
<li>protoc
<li>pycocotools
<li>tensorflow-addons==0.11.0
2 changes: 1 addition & 1 deletion benchmarks/object_detection/tensorflow_serving/ssd-mobilenet/inference/fp32/requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ Cython
contextlib2
jupyter
matplotlib
pillow>=8.1.2
pillow>=9.3.0
lxml
absl-py
notebook>=6.1.5
2 changes: 1 addition & 1 deletion dockerfiles/dataset_containers/intel-tf-object-detection-preprocess-coco-val.Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -64,7 +64,7 @@ RUN pip install \
lxml \
matplotlib \
numpy>=1.17.4 \
'pillow>=8.1.2' && \
'pillow>=9.3.0' && \
pip install pycocotools

ARG TF_MODELS_DIR=/tensorflow/models
2 changes: 1 addition & 1 deletion dockerfiles/intel-tf-object-detection.Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -64,7 +64,7 @@ RUN pip install \
lxml \
matplotlib \
numpy>=1.17.4 \
'pillow>=8.1.2' && \
'pillow>=9.3.0' && \
pip install pycocotools

ARG TF_MODELS_DIR=/tensorflow/models
Loading