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

[Nvidia] [202205] Update syncd docker to use python version 3 #17733

Closed
wants to merge 5 commits into from
+28 −31
Closed

[Nvidia] [202205] Update syncd docker to use python version 3 #17733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9f68812
Revert "[Mellanox] Install python2 on syncd (#14151)"
liorghub Dec 6, 2023
9ba32c2
Remove python2 from compilation of python-sdk-api
liorghub Dec 3, 2023
55b5346
Upgrade Python version in syncd RPC docker image to Python3
liorghub Dec 10, 2023
4ae518d
Update header in syncd docker files
liorghub Dec 20, 2023
cc8a886
Second update in syncd docker files
liorghub Jan 21, 2024
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
48 changes: 24 additions & 24 deletions platform/mellanox/docker-syncd-mlnx-rpc/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
##
## Copyright (c) 2016-2021 NVIDIA CORPORATION & AFFILIATES.
## Copyright (c) 2016-2024 NVIDIA CORPORATION & AFFILIATES.
## Apache-2.0
##
## Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -25,23 +25,27 @@ RUN mkdir -p /var/run/sx_sdk
RUN apt-get purge -y syncd

## Pre-install the fundamental packages
RUN apt-get update \
&& apt-get -y install \
net-tools \
python-setuptools \
build-essential \
libssl-dev \
libffi-dev \
python-dev \
wget \
cmake \
libqt5core5a \
libqt5network5 \
libboost-atomic1.74.0
RUN apt-get update \
&& apt-get -y install \
net-tools \
build-essential \
libssl-dev \
libffi-dev \
wget \
cmake \
libqt5core5a \
libqt5network5 \
libboost-atomic1.74.0 \
python3-pip \
python3-dev \
python-is-python3 \
python3-setuptools

RUN pip3 install --upgrade pip

# Build and install python-scapy
RUN curl http://ftp.us.debian.org/debian/pool/main/s/scapy/python-scapy_2.4.0-2_all.deb --output python-scapy_2.4.0-2_all.deb \
&& dpkg -i python-scapy_2.4.0-2_all.deb \
RUN curl http://ftp.us.debian.org/debian/pool/main/s/scapy/python3-scapy_2.4.0-2_all.deb --output python3-scapy_2.4.0-2_all.deb \
&& dpkg -i python3-scapy_2.4.0-2_all.deb \
&& apt install -f

{% if docker_syncd_mlnx_rpc_debs.strip() -%}
Expand All @@ -64,10 +68,6 @@ RUN curl http://ftp.us.debian.org/debian/pool/main/s/scapy/python-scapy_2.4.0-2_
{{ install_debian_packages(docker_syncd_mlnx_rpc_pydebs.split(' ')) }}
{% endif %}

# Install pip2 since it is no longer in the APT upstream
RUN curl https://bootstrap.pypa.io/pip/2.7/get-pip.py --output get-pip.py \
&& python2 get-pip.py

RUN wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \
&& tar xvfz 1.0.0.tar.gz \
&& cd nanomsg-1.0.0 \
Expand All @@ -78,10 +78,10 @@ RUN wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \
&& cd .. \
&& rm -fr nanomsg-1.0.0 \
&& rm -f 1.0.0.tar.gz \
&& pip2 install cffi==1.7.0 \
&& pip2 install --upgrade cffi==1.7.0 \
&& pip2 install wheel \
&& pip2 install nnpy \
&& pip3 install cffi==1.16.0 \
&& pip3 install wheel \
&& pip3 install nnpy \
&& pip3 install ptf \
&& mkdir -p /opt \
&& cd /opt \
&& wget https://raw.githubusercontent.com/p4lang/ptf/master/ptf_nn/ptf_nn_agent.py \
Expand Down
2 changes: 1 addition & 1 deletion platform/mellanox/docker-syncd-mlnx-rpc/ptf_nn_agent.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[program:ptf_nn_agent]
command=/usr/bin/python2 /opt/ptf_nn_agent.py --device-socket 1@tcp://0.0.0.0:10900 -i 1-3@Ethernet12 --set-nn-rcv-buffer=109430400 --set-iface-rcv-buffer=109430400 --set-nn-snd-buffer=109430400 --set-iface-snd-buffer=109430400
command=/usr/bin/python3 /opt/ptf_nn_agent.py --device-socket 1@tcp://0.0.0.0:10900 -i 1-3@Ethernet12 --set-nn-rcv-buffer=109430400 --set-iface-rcv-buffer=109430400 --set-nn-snd-buffer=109430400 --set-iface-snd-buffer=109430400
process_name=ptf_nn_agent
stdout_logfile=/tmp/ptf_nn_agent.out.log
stderr_logfile=/tmp/ptf_nn_agent.err.log
Expand Down
7 changes: 2 additions & 5 deletions platform/mellanox/docker-syncd-mlnx/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
##
## Copyright (c) 2016-2021 NVIDIA CORPORATION & AFFILIATES.
## Copyright (c) 2016-2024 NVIDIA CORPORATION & AFFILIATES.
## Apache-2.0
##
## Licensed under the Apache License, Version 2.0 (the "License");
Expand Down Expand Up @@ -29,20 +29,17 @@ ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update && \
apt-get install -y \
libxml2 \
python-dev \
python3-pip \
python3-dev \
python-is-python3 \
{%- if ENABLE_ASAN == "y" %}
libasan6 \
{%- endif %}
python-setuptools \
python3-setuptools

RUN pip3 install --upgrade pip
RUN apt-get purge -y python-pip

RUN curl https://bootstrap.pypa.io/pip/2.7/get-pip.py --output get-pip.py

{% if docker_syncd_mlnx_debs.strip() -%}
# Copy locally-built Debian package dependencies
{{ copy_files("debs/", docker_syncd_mlnx_debs.split(' '), "/debs/") }}
Expand Down
2 changes: 1 addition & 1 deletion platform/mellanox/sdk-src/python-sdk-api/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
./autogen.sh
fi

debuild -e PYTHON_INTERPRETERS="\"python2 python3\"" -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS)
debuild -e PYTHON_INTERPRETERS="\"python3\"" -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS)

popd

Expand Down