Upgrade protobuf to 5.29.5

Signed-off-by: Lacewell, Chaunte W <[email protected]>

Author: cwlacewe

.github/requirements.txt

@@ -14,7 +14,7 @@ MarkupSafe==3.0.2
 numpy==1.26.4
 opencv-python-headless==4.11.0.86
 pillow==11.1.0
-protobuf==4.25.8
+protobuf==5.29.5
 pycparser==2.22
 Pygments==2.19.1
 pyzmq==26.4.0

.github/scripts/Dockerfile.checkin

@@ -21,7 +21,7 @@ ENV DEBIAN_FRONTEND=noninteractive
 ENV DEBCONF_NOWARNINGS="yes"
 ENV PYTHON_BASE="3.12"
 ENV PYTHON_VERSION="${PYTHON_BASE}.3"
-ENV PROTOBUF_VERSION="25.8"
+ENV PROTOBUF_VERSION="29.5"
 ENV NUMPY_MIN_VERSION="1.26.0"
 ENV VIRTUAL_ENV=/opt/venv
 
@@ -77,6 +77,7 @@ ENV AUTOCONF_VERSION="2.71" \
     AWS_SDK_VERSION="1.11.336" \
     CMAKE_VERSION="v3.28.5"  \
     FAISS_VERSION="v1.9.0" \
+    GOOGLETEST_VERSION="v1.17.0" \
     LIBEDIT_VERSION="20230828-3.1" \
     OPENCV_VERSION="4.9.0" \
     PEG_VERSION="0.1.19" \
@@ -89,27 +90,24 @@ RUN git clone --branch ${CMAKE_VERSION} https://github.com/Kitware/CMake.git /de
         cd /dependencies/CMake && ./bootstrap && make ${BUILD_THREADS} && \
             make install DESTDIR=/opt/dist && make install
 
+# GOOGLETEST
+# hadolint ignore=DL3003,SC2086
+RUN git clone -b "${GOOGLETEST_VERSION}" https://github.com/google/googletest.git /dependencies/googletest && \
+    cd /dependencies/googletest && mkdir build && cd build/ && \
+    cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_BUILD_TYPE=Release \
+        -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/opt/dist/usr/local \
+        -DBUILD_GMOCK=ON -DCMAKE_CXX_STANDARD=17 .. && \
+    make ${BUILD_THREADS} && make install
+
 # PROTOBUF & ITS DEPENDENCIES
 # hadolint ignore=DL3003,SC2086
 RUN git clone -b "v${PROTOBUF_VERSION}" --recurse-submodules https://github.com/protocolbuffers/protobuf.git /dependencies/protobuf && \
-        cd /dependencies/protobuf/third_party/googletest && mkdir build && cd build/ && \
-            cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_BUILD_TYPE=Release \
-                -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/opt/dist/usr/local \
-                -DBUILD_GMOCK=ON -DCMAKE_CXX_STANDARD=17 .. && \
-            make ${BUILD_THREADS} && make install && \
-        cd /dependencies/protobuf/third_party/abseil-cpp && mkdir build && cd build && \
-            cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_SHARED_LIBS=ON \
-                -DCMAKE_INSTALL_PREFIX=/opt/dist/usr/local -DABSL_BUILD_TESTING=ON \
-                -DABSL_USE_EXTERNAL_GOOGLETEST=ON \
-                -DABSL_FIND_GOOGLETEST=ON -DCMAKE_CXX_STANDARD=17 .. && \
-            make ${BUILD_THREADS} && make install && ldconfig /opt/dist/usr/local/lib && \
         cd /dependencies/protobuf && \
-            cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_INSTALL_PREFIX=/opt/dist/usr/local \
-                -DCMAKE_CXX_STANDARD=17 -Dprotobuf_BUILD_SHARED_LIBS=ON \
-                -Dprotobuf_ABSL_PROVIDER=package \
-                -Dprotobuf_BUILD_TESTS=ON \
-                -Dabsl_DIR=/opt/dist/usr/local/lib/cmake/absl . && \
-            make ${BUILD_THREADS} && make install
+        cmake -Dprotobuf_FORCE_FETCH_DEPENDENCIES=ON \
+            -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_INSTALL_PREFIX=/opt/dist/usr/local \
+            -DCMAKE_CXX_STANDARD=17 -Dprotobuf_BUILD_SHARED_LIBS=ON \
+            -Dprotobuf_BUILD_TESTS=ON . && \
+        make ${BUILD_THREADS} && make install
 
 # OPENCV
 # hadolint ignore=DL3003,SC2086
@@ -253,7 +251,7 @@ RUN apt-get update -y && apt-get upgrade -y && \
     apt-get --purge remove -y python3.11 && apt-get autoremove -y && \
     apt-get clean && rm -rf /var/lib/apt/lists/* && \
     echo "/usr/local/lib" >> /etc/ld.so.conf.d/all-libs.conf && ldconfig && \
-    python3 -m pip install --no-cache-dir "numpy>=${NUMPY_MIN_VERSION},<2.0.0" "protobuf==4.${PROTOBUF_VERSION}" \
+    python3 -m pip install --no-cache-dir "numpy>=${NUMPY_MIN_VERSION},<2.0.0" "protobuf==5.${PROTOBUF_VERSION}" \
         "coverage>=7.3.1" "cryptography>=44.0.1"
 
 # COVERAGE TESTING

.github/scripts/setup_vdms.sh

@@ -176,7 +176,7 @@ export PATH="$VIRTUAL_ENV/bin:$PATH"
 
 if [ "${BUILD_COVERAGE}" = "ON" ]; then
     apt-get install -y --no-install-suggests --no-install-recommends gdb
-    python -m pip install --no-cache-dir "gcovr>=7.0"
+    python -m pip install --no-cache-dir "gcovr==8.4"
     curl -L -o ${WORKSPACE}/minio https://dl.min.io/server/minio/release/linux-amd64/minio
     chmod +x ${WORKSPACE}/minio
     mkdir -p ${WORKSPACE}/minio_files/minio-bucket
@@ -194,11 +194,12 @@ AUTOCONF_VERSION="2.71"
 AWS_SDK_VERSION="1.11.336"
 CMAKE_VERSION="v3.28.5"
 FAISS_VERSION="v1.9.0"
+GOOGLETEST_VERSION="v1.17.0"
 LIBEDIT_VERSION="20230828-3.1"
 NUMPY_MIN_VERSION="1.26.0"
 OPENCV_VERSION="4.9.0"
 PEG_VERSION="0.1.19"
-PROTOBUF_VERSION="25.8"
+PROTOBUF_VERSION="29.5"
 TILEDB_VERSION="2.14.1"
 VALIJSON_VERSION="v0.6"
 
@@ -213,32 +214,24 @@ make ${BUILD_THREADS}
 make install
 
 
-# INSTALL PROTOBUF & ITS DEPENDENCIES
-git clone -b "v${PROTOBUF_VERSION}" --recurse-submodules https://github.com/protocolbuffers/protobuf.git $VDMS_DEP_DIR/protobuf
-cd $VDMS_DEP_DIR/protobuf/third_party/googletest
+# GOOGLETEST
+git clone -b "${GOOGLETEST_VERSION}" https://github.com/google/googletest.git $VDMS_DEP_DIR/googletest
+cd $VDMS_DEP_DIR/googletest
 mkdir build && cd build/
 cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_BUILD_TYPE=Release \
     -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/usr/local \
     -DBUILD_GMOCK=ON -DCMAKE_CXX_STANDARD=17 ..
 make ${BUILD_THREADS}
 make install
 
-cd $VDMS_DEP_DIR/protobuf/third_party/abseil-cpp
-mkdir build && cd build
-cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_SHARED_LIBS=ON \
-    -DCMAKE_INSTALL_PREFIX=/usr/local -DABSL_BUILD_TESTING=ON \
-    -DABSL_USE_EXTERNAL_GOOGLETEST=ON \
-    -DABSL_FIND_GOOGLETEST=ON -DCMAKE_CXX_STANDARD=17 ..
-make ${BUILD_THREADS}
-make install
-ldconfig /usr/local/lib
 
+# INSTALL PROTOBUF & ITS DEPENDENCIES
+git clone -b "v${PROTOBUF_VERSION}" --recurse-submodules https://github.com/protocolbuffers/protobuf.git $VDMS_DEP_DIR/protobuf
 cd $VDMS_DEP_DIR/protobuf
-cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_INSTALL_PREFIX=/usr/local \
+cmake -Dprotobuf_FORCE_FETCH_DEPENDENCIES=ON \
+    -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_INSTALL_PREFIX=/usr/local \
     -DCMAKE_CXX_STANDARD=17 -Dprotobuf_BUILD_SHARED_LIBS=ON \
-    -Dprotobuf_ABSL_PROVIDER=package \
-    -Dprotobuf_BUILD_TESTS=ON \
-    -Dabsl_DIR=/usr/local/lib/cmake/absl .
+    -Dprotobuf_BUILD_TESTS=ON .
 make ${BUILD_THREADS}
 make install
 
@@ -255,7 +248,7 @@ make install
 
 # INSTALL PYTHON PACKAGES
 python -m pip install --no-cache-dir "numpy>=${NUMPY_MIN_VERSION},<2.0.0" "coverage>=7.3.1" \
-    "protobuf==4.${PROTOBUF_VERSION}" "cryptography>=44.0.1"
+    "protobuf==5.${PROTOBUF_VERSION}" "cryptography>=44.0.1"
 
 
 # INSTALL VALIJSON

client/python/setup.py

@@ -5,11 +5,11 @@
 
 setuptools.setup(
     name="vdms",
-    version="0.0.21",
+    version="0.0.22",
     author="Chaunté W. Lacewell",
     author_email="[email protected]",
     description="VDMS Client Module",
-    install_requires=["protobuf==4.25.8"],
+    install_requires=["protobuf==5.29.5"],
     long_description=long_description,
     long_description_content_type="text/markdown",
     url="https://github.com/IntelLabs/vdms",

client/python/vdms/queryMessage_pb2.py

@@ -21,7 +21,7 @@ ENV DEBIAN_FRONTEND=noninteractive
 ENV DEBCONF_NOWARNINGS="yes"
 ENV PYTHON_BASE="3.12"
 ENV PYTHON_VERSION="${PYTHON_BASE}.3"
-ENV PROTOBUF_VERSION="25.8"
+ENV PROTOBUF_VERSION="29.5"
 ENV NUMPY_MIN_VERSION="1.26.0"
 ENV VIRTUAL_ENV=/opt/venv
 
@@ -77,6 +77,7 @@ ENV AUTOCONF_VERSION="2.71" \
     AWS_SDK_VERSION="1.11.336" \
     CMAKE_VERSION="v3.28.5"  \
     FAISS_VERSION="v1.9.0" \
+    GOOGLETEST_VERSION="v1.17.0" \
     LIBEDIT_VERSION="20230828-3.1" \
     OPENCV_VERSION="4.9.0" \
     PEG_VERSION="0.1.19" \
@@ -89,27 +90,24 @@ RUN git clone --branch ${CMAKE_VERSION} https://github.com/Kitware/CMake.git /de
         cd /dependencies/CMake && ./bootstrap && make ${BUILD_THREADS} && \
             make install DESTDIR=/opt/dist && make install
 
+# GOOGLETEST
+# hadolint ignore=DL3003,SC2086
+RUN git clone -b "${GOOGLETEST_VERSION}" https://github.com/google/googletest.git /dependencies/googletest && \
+    cd /dependencies/googletest && mkdir build && cd build/ && \
+    cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_BUILD_TYPE=Release \
+        -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/opt/dist/usr/local \
+        -DBUILD_GMOCK=ON -DCMAKE_CXX_STANDARD=17 .. && \
+    make ${BUILD_THREADS} && make install
+
 # PROTOBUF & ITS DEPENDENCIES
 # hadolint ignore=DL3003,SC2086
 RUN git clone -b "v${PROTOBUF_VERSION}" --recurse-submodules https://github.com/protocolbuffers/protobuf.git /dependencies/protobuf && \
-        cd /dependencies/protobuf/third_party/googletest && mkdir build && cd build/ && \
-            cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_BUILD_TYPE=Release \
-                -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/opt/dist/usr/local \
-                -DBUILD_GMOCK=ON -DCMAKE_CXX_STANDARD=17 .. && \
-            make ${BUILD_THREADS} && make install && \
-        cd /dependencies/protobuf/third_party/abseil-cpp && mkdir build && cd build && \
-            cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_SHARED_LIBS=ON \
-                -DCMAKE_INSTALL_PREFIX=/opt/dist/usr/local -DABSL_BUILD_TESTING=ON \
-                -DABSL_USE_EXTERNAL_GOOGLETEST=ON \
-                -DABSL_FIND_GOOGLETEST=ON -DCMAKE_CXX_STANDARD=17 .. && \
-            make ${BUILD_THREADS} && make install && ldconfig /opt/dist/usr/local/lib && \
         cd /dependencies/protobuf && \
-            cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_INSTALL_PREFIX=/opt/dist/usr/local \
-                -DCMAKE_CXX_STANDARD=17 -Dprotobuf_BUILD_SHARED_LIBS=ON \
-                -Dprotobuf_ABSL_PROVIDER=package \
-                -Dprotobuf_BUILD_TESTS=ON \
-                -Dabsl_DIR=/opt/dist/usr/local/lib/cmake/absl . && \
-            make ${BUILD_THREADS} && make install
+        cmake -Dprotobuf_FORCE_FETCH_DEPENDENCIES=ON \
+            -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_INSTALL_PREFIX=/opt/dist/usr/local \
+            -DCMAKE_CXX_STANDARD=17 -Dprotobuf_BUILD_SHARED_LIBS=ON \
+            -Dprotobuf_BUILD_TESTS=ON . && \
+        make ${BUILD_THREADS} && make install
 
 # OPENCV
 # hadolint ignore=DL3003,SC2086
@@ -227,7 +225,7 @@ RUN apt-get update -y && apt-get upgrade -y && \
     apt-get --purge remove -y python3.11 && apt-get autoremove -y && \
     apt-get clean && rm -rf /var/lib/apt/lists/* && \
     echo "/usr/local/lib" >> /etc/ld.so.conf.d/all-libs.conf && ldconfig && \
-    python3 -m pip install --no-cache-dir "numpy>=${NUMPY_MIN_VERSION},<2.0.0" "protobuf==4.${PROTOBUF_VERSION}" \
+    python3 -m pip install --no-cache-dir "numpy>=${NUMPY_MIN_VERSION},<2.0.0" "protobuf==5.${PROTOBUF_VERSION}" \
         "coverage>=7.3.1" "cryptography>=44.0.1"
 
 # VDMS

docker/base/Dockerfile

@@ -105,38 +105,33 @@ sudo make install
 ```
 <br>
 
-#### **Protobuf v25.8 (4.25.8)**
-Install Protobuf (C++ and Python) which requires GoogleTest and Abseil C++ as dependencies.
+#### **GoogleTest v1.17.0**
+Install GoogleTest v1.17.0:
 ```bash
-PROTOBUF_VERSION="25.8"
-python3 -m pip install --no-cache-dir "protobuf==4.${PROTOBUF_VERSION}"
-
-git clone -b v${PROTOBUF_VERSION} --recurse-submodules https://github.com/protocolbuffers/protobuf.git $VDMS_DEP_DIR/protobuf
-
-cd $VDMS_DEP_DIR/protobuf/third_party/googletest
-mkdir build && cd build
+GOOGLETEST_VERSION="v1.17.0"
+git clone -b "${GOOGLETEST_VERSION}" https://github.com/google/googletest.git $VDMS_DEP_DIR/googletest && \
+cd $VDMS_DEP_DIR/googletest
+mkdir build && cd build/
 cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_BUILD_TYPE=Release \
     -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/usr/local \
     -DBUILD_GMOCK=ON -DCMAKE_CXX_STANDARD=17 ..
 make ${BUILD_THREADS}
 sudo make install
+```
+<br>
 
-cd $VDMS_DEP_DIR/protobuf/third_party/abseil-cpp
-mkdir build && cd build
-cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_SHARED_LIBS=ON \
-    -DCMAKE_INSTALL_PREFIX=/usr/local -DABSL_BUILD_TESTING=ON \
-    -DABSL_USE_EXTERNAL_GOOGLETEST=ON \
-    -DABSL_FIND_GOOGLETEST=ON -DCMAKE_CXX_STANDARD=17 ..
-make ${BUILD_THREADS}
-sudo make install
-sudo ldconfig /usr/local/lib
+#### **Protobuf v29.5 (5.29.5)**
+Install Protobuf (C++ and Python) with its dependencies.
+```bash
+PROTOBUF_VERSION="29.5"
+python3 -m pip install --no-cache-dir "protobuf==4.${PROTOBUF_VERSION}"
 
+git clone -b v${PROTOBUF_VERSION} --recurse-submodules https://github.com/protocolbuffers/protobuf.git $VDMS_DEP_DIR/protobuf
 cd $VDMS_DEP_DIR/protobuf
-cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_INSTALL_PREFIX=/usr/local \
+cmake -Dprotobuf_FORCE_FETCH_DEPENDENCIES=ON \
+    -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_INSTALL_PREFIX=/usr/local \
     -DCMAKE_CXX_STANDARD=17 -Dprotobuf_BUILD_SHARED_LIBS=ON \
-    -Dprotobuf_ABSL_PROVIDER=package \
-    -Dprotobuf_BUILD_TESTS=ON \
-    -Dabsl_DIR=/usr/local/lib/cmake/absl .
+    -Dprotobuf_BUILD_TESTS=ON .
 make ${BUILD_THREADS}
 sudo make install
 ```

docs/Install.md

@@ -93,5 +93,6 @@ target_link_libraries(unit_tests
     ${OpenCV_LIBS}
     ${AWSSDK_LINK_LIBRARIES}
     neo4j-client
+    -lgtest
 )