Prerequisites - Boost removed (r-abishek#231)

* Bump rocm-docs-core from 0.24.0 to 0.24.1 in /docs/.sphinx (r-abishek#219) Bumps [rocm-docs-core](https://github.com/RadeonOpenCompute/rocm-docs-core) from 0.24.0 to 0.24.1. - [Release notes](https://github.com/RadeonOpenCompute/rocm-docs-core/releases) - [Changelog](https://github.com/RadeonOpenCompute/rocm-docs-core/blob/develop/CHANGELOG.md) - [Commits](ROCm/rocm-docs-core@v0.24.0...v0.24.1) --- updated-dependencies: - dependency-name: rocm-docs-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump rocm-docs-core from 0.24.1 to 0.24.2 in /docs/.sphinx (r-abishek#222) Bumps [rocm-docs-core](https://github.com/RadeonOpenCompute/rocm-docs-core) from 0.24.1 to 0.24.2. - [Release notes](https://github.com/RadeonOpenCompute/rocm-docs-core/releases) - [Changelog](https://github.com/RadeonOpenCompute/rocm-docs-core/blob/develop/CHANGELOG.md) - [Commits](ROCm/rocm-docs-core@v0.24.1...v0.24.2) --- updated-dependencies: - dependency-name: rocm-docs-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump rocm-docs-core from 0.24.2 to 0.25.0 in /docs/.sphinx (r-abishek#225) Bumps [rocm-docs-core](https://github.com/RadeonOpenCompute/rocm-docs-core) from 0.24.2 to 0.25.0. - [Release notes](https://github.com/RadeonOpenCompute/rocm-docs-core/releases) - [Changelog](https://github.com/RadeonOpenCompute/rocm-docs-core/blob/develop/CHANGELOG.md) - [Commits](ROCm/rocm-docs-core@v0.24.2...v0.25.0) --- updated-dependencies: - dependency-name: rocm-docs-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump rocm-docs-core from 0.25.0 to 0.26.0 in /docs/.sphinx (r-abishek#228) Bumps [rocm-docs-core](https://github.com/RadeonOpenCompute/rocm-docs-core) from 0.25.0 to 0.26.0. - [Release notes](https://github.com/RadeonOpenCompute/rocm-docs-core/releases) - [Changelog](https://github.com/RadeonOpenCompute/rocm-docs-core/blob/develop/CHANGELOG.md) - [Commits](ROCm/rocm-docs-core@v0.25.0...v0.26.0) --- updated-dependencies: - dependency-name: rocm-docs-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * ENABLE ASAN packaging RPP (r-abishek#227) * ENABLE ASAN packaging RPP * Add LICENSE File to RPP Package * Update README.md Pre-reqs * RPP Doxygen Update 2 (r-abishek#226) * Remove rpp core * Doxygen fixes for rpp.h * Update enum values per line to 1 * Doxygen fixes for rppdefs.h * Doxygen fixes for rppi.h * Doxygen fixes for rppt.h * Doxygen fixes for rppversion.h * Rename Filter struct to GenericFilter to avoid Doxygen autoreference * Add deprecated docs for image ops * Doxygen fixes for all rppi headers * Doxygen fixes for all rppt headers, and replace \ingroup with \addtogroup * Change deprecation note - "To be deprecated" * Add \deprecated flag * Minor fix * Add output samples for doxygen * Add doxygen input * Fix docs for brightness * Add correct image path to Doxyfile * Add input/output images for brightness * Fix doxygen for brightness, blend and gamma correction * Change to add "Sample" to docs * Fix doxygen for color_cast, color_jitter, color_twist * Fix all doxygen docs for color augmentations * Fix doxygen for filter funcs * doxygen fixes for data exchange ops * Add sample second input to docs * Add more sample ouputs for doxygen docs * Fix doxygen docs for gridmask and spatter * Fix docs for swap_channels * Fix doxygen docs for snp, shot and gaussian noise * Fix doxygen docs for blend and non linear blend * Fix doxygen docs for statistical ops * remove boost library * cmake fix * code cleanup * suppress nodiscard attribute error * filesystem modification * filesystem modification * code cleanup * data type fix --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: arvindcheru <90783369+arvindcheru@users.noreply.github.com> Co-authored-by: Kiriti Gowda <kiritigowda@gmail.com> Co-authored-by: Abishek <52214183+r-abishek@users.noreply.github.com>
snehaa8 · Oct 23, 2023 · 7a29139 · 7a29139
1 parent 504170f
commit 7a29139
Show file tree

Hide file tree

Showing 48 changed files with 111 additions and 360 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,7 @@
 
 #### Changed
 * Documentation
+* Replaced the boost functions with std c++ library to remove boost library dependency
 
 #### Fixed
 * OCL Backend

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -20,7 +20,7 @@
 
 cmake_minimum_required(VERSION 3.5)
 set(CMAKE_CXX_COMPILER clang++)
-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 17)
 
 project(rpp CXX)
 
@@ -120,13 +120,8 @@ if("${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
 endif()
 list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
 
-# BOOST
-option(Boost_USE_STATIC_LIBS "Use boost static libraries" OFF)
-set(BOOST_COMPONENTS filesystem system)
-add_definitions(-DBOOST_ALL_NO_LIB=1)
-find_package(Boost COMPONENTS ${BOOST_COMPONENTS} REQUIRED)
-include_directories(${Boost_INCLUDE_DIRS})
-set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY})
+# Filesystem support
+set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} stdc++fs)
 
 # OpenMP
 find_package(OpenMP REQUIRED)
@@ -262,6 +257,7 @@ else()
     message("-- ${Red}${PROJECT_NAME} set to build without ENABLE_SIMD_INTRINSICS${ColourReset}")
 endif()
 
+
 set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} stdc++)
 message("-- ${White}${PROJECT_NAME} -- Using Compiler - Path:" ${CMAKE_CXX_COMPILER} "\tVersion:" ${CMAKE_CXX_COMPILER_VERSION} "\tCompiler:" ${CMAKE_CXX_COMPILER_ID}${ColourReset})
 message("-- ${White}${PROJECT_NAME} -- CMAKE_CXX_FLAGS:${CMAKE_CXX_FLAGS}${ColourReset}")

diff --git a/README.md b/README.md
@@ -80,17 +80,6 @@ doxygen .Doxyfile
 
 * CMake Version `3.5` and above
 
-* Boost Version `1.66` and above
-  ```
-  wget https://boostorg.jfrog.io/artifactory/main/release/1.72.0/source/boost_1_72_0.tar.gz
-  tar -xzvf boost_1_72_0.tar.gz
-  cd boost_1_72_0
-  ./bootstrap.sh --prefix=${RPP_DEPS_LOCATION} --with-python=python3
-  ./b2 install
-  ```
-  + **NOTE:** [Install from source](https://www.boost.org/doc/libs/1_72_0/more/getting_started/unix-variants.html#easy-build-and-install)
-  + **--prefix=${RPP_DEPS_LOCATION}:** `ENV RPP_DEPS_LOCATION=/usr/local/rpp-deps`
-
 * IEEE 754-based half-precision floating-point library - half.hpp
 
   ```

diff --git a/docker/rpp-on-ubuntu20.dockerfile b/docker/rpp-on-ubuntu20.dockerfile
@@ -16,15 +16,9 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install initramfs-tools libnuma-de
         sudo apt-get install -y ./${ROCM_INSTALLER_PACKAGE} && \
         sudo apt-get update -y && \
         sudo amdgpu-install -y --usecase=graphics,rocm
-# install rpp dependencies - half.hpp & boost
+# install rpp dependencies - half.hpp
 RUN wget https://sourceforge.net/projects/half/files/half/1.12.0/half-1.12.0.zip && \
-        unzip half-1.12.0.zip -d half-files && mkdir -p /usr/local/include/half && cp half-files/include/half.hpp /usr/local/include/half && \
-        wget https://boostorg.jfrog.io/artifactory/main/release/1.72.0/source/boost_1_72_0.tar.bz2 && tar xjvf boost_1_72_0.tar.bz2 && \
-        cd boost_1_72_0 && ./bootstrap.sh --prefix=/usr/local --with-python=python3 && \
-        ./b2 stage -j16 threading=multi link=shared cxxflags="-std=c++11" && \
-        ./b2 install threading=multi link=shared --with-system --with-filesystem && \
-        ./b2 stage -j16 threading=multi link=static cxxflags="-std=c++11 -fpic" cflags="-fpic" && \
-        ./b2 install threading=multi link=static --with-system --with-filesystem
+        unzip half-1.12.0.zip -d half-files && mkdir -p /usr/local/include/half && cp half-files/include/half.hpp /usr/local/include/half
 
 ENV RPP_WORKSPACE=/workspace
 WORKDIR $RPP_WORKSPACE

diff --git a/docker/rpp-on-ubuntu22.dockerfile b/docker/rpp-on-ubuntu22.dockerfile
@@ -16,16 +16,10 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install initramfs-tools libnuma-de
         sudo apt-get install -y ./${ROCM_INSTALLER_PACKAGE} && \
         sudo apt-get update -y && \
         sudo amdgpu-install -y --usecase=graphics,rocm
-# install rpp dependencies - half.hpp & boost
+# install rpp dependencies - half.hpp
 RUN wget https://sourceforge.net/projects/half/files/half/1.12.0/half-1.12.0.zip && \
         unzip half-1.12.0.zip -d half-files && mkdir -p /usr/local/include/half && cp half-files/include/half.hpp /usr/local/include/half
-RUN apt-get -y install sqlite3 libsqlite3-dev libtool build-essential && \
-    wget https://boostorg.jfrog.io/artifactory/main/release/1.80.0/source/boost_1_80_0.tar.bz2 && tar xjvf boost_1_80_0.tar.bz2 && \
-    cd boost_1_80_0 && ./bootstrap.sh --prefix=/usr/local --with-python=python3 && \
-    ./b2 stage -j16 threading=multi link=shared cxxflags="-std=c++11" && \
-    sudo ./b2 install threading=multi link=shared --with-system --with-filesystem && \
-    ./b2 stage -j16 threading=multi link=static cxxflags="-std=c++11 -fpic" cflags="-fpic" && \
-    sudo ./b2 install threading=multi link=static --with-system --with-filesystem
+RUN apt-get -y install sqlite3 libsqlite3-dev libtool build-essential
 
 ENV RPP_WORKSPACE=/workspace
 WORKDIR $RPP_WORKSPACE

diff --git a/docs/prereq.md b/docs/prereq.md
@@ -35,16 +35,6 @@
 
 * CMake Version `3.5` and above
 
-* Boost Version `1.72` and above
-  ```
-  wget https://boostorg.jfrog.io/artifactory/main/release/1.72.0/source/boost_1_72_0.tar.gz
-  tar -xzvf boost_1_72_0.tar.gz
-  cd boost_1_72_0
-  ./bootstrap.sh
-  ./b2 install
-  ```
-  + **NOTE:** [Install from source](https://www.boost.org/doc/libs/1_72_0/more/getting_started/unix-variants.html#easy-build-and-install)
-
 * IEEE 754-based half-precision floating-point library - half.hpp
 
   ```

diff --git a/include/config.h → include/filesystem.h b/include/config.h → include/filesystem.h
@@ -20,5 +20,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-//#cmakedefine HIP_OC_COMPILER "@HIP_OC_COMPILER@"
-#define RPP_GPU_SYNC 0
+#if __cplusplus >= 201703L && __has_include(<filesystem>)
+    #include <filesystem>
+    namespace fs = std::filesystem;
+#elif __has_include(<experimental/filesystem>)
+    #include <experimental/filesystem>
+    namespace fs = std::experimental::filesystem;
+#endif
diff --git a/include/rppt_tensor_geometric_augmentations.h b/include/rppt_tensor_geometric_augmentations.h
@@ -404,4 +404,4 @@ RppStatus rppt_rotate_gpu(RppPtr_t srcPtr, RpptDescPtr srcDescPtr, RppPtr_t dstP
 #ifdef __cplusplus
 }
 #endif
-#endif // RPPT_TENSOR_GEOMETRIC_AUGMENTATIONS_H
+#endif // RPPT_TENSOR_GEOMETRIC_AUGMENTATIONS_H
diff --git a/include/rppt_tensor_morphological_operations.h b/include/rppt_tensor_morphological_operations.h
@@ -96,4 +96,4 @@ RppStatus rppt_dilate_gpu(RppPtr_t srcPtr, RpptDescPtr srcDescPtr, RppPtr_t dstP
 #ifdef __cplusplus
 }
 #endif
-#endif // RPPT_TENSOR_MORPHOLOGICAL_OPERATIONS_H
+#endif // RPPT_TENSOR_MORPHOLOGICAL_OPERATIONS_H
diff --git a/src/include/cl/rpp/util.hpp b/src/include/cl/rpp/util.hpp
diff --git a/src/include/common/rpp/binary_cache.hpp b/src/include/common/rpp/binary_cache.hpp
@@ -28,21 +28,21 @@
 #define GUARD_RPP_BINARY_CACHE_HPP
 
 #include <string>
-#include <boost/filesystem/path.hpp>
+#include "filesystem.h"
 
 namespace rpp {
 
-boost::filesystem::path GetCacheFile(const std::string& device,
+fs::path GetCacheFile(const std::string& device,
                                      const std::string& name,
                                      const std::string& args,
                                      bool is_kernel_str);
 
-boost::filesystem::path GetCachePath();
+fs::path GetCachePath();
 std::string LoadBinary(const std::string& device,
                        const std::string& name,
                        const std::string& args,
                        bool is_kernel_str = false);
-void SaveBinary(const boost::filesystem::path& binary_path,
+void SaveBinary(const fs::path& binary_path,
                 const std::string& device,
                 const std::string& name,
                 const std::string& args,

diff --git a/src/include/common/rpp/handle.hpp b/src/include/common/rpp/handle.hpp
@@ -32,10 +32,8 @@
 #include <memory>
 #include <vector>
 #include <unordered_map>
-#include <boost/range/adaptor/transformed.hpp>
 
 #include "rpp.h"
-#include "config.h"
 #include "rppdefs.h"
 #include "rpp/common.hpp"
 #include "rpp/kernel.hpp"

diff --git a/src/include/common/rpp/handle_lock.hpp b/src/include/common/rpp/handle_lock.hpp
diff --git a/src/include/common/rpp/hip_build_utils.hpp b/src/include/common/rpp/hip_build_utils.hpp
@@ -25,18 +25,18 @@
 *******************************************************************************/
 #pragma once
 
-#include <boost/optional.hpp>
+#include <optional>
 
 #include "rpp/kernel.hpp"
 #include "rpp/tmp_dir.hpp"
 #include "rpp/write_file.hpp"
 
 namespace rpp {
-boost::filesystem::path HipBuild(boost::optional<rpp::TmpDir>& tmp_dir,
+fs::path HipBuild(std::optional<rpp::TmpDir>& tmp_dir,
                                  const std::string& filename,
                                  std::string src,
                                  std::string params,
                                  const std::string& dev_name);
 
-void bin_file_to_str(const boost::filesystem::path& file, std::string& buf);
+void bin_file_to_str(const fs::path& file, std::string& buf);
 } // namespace rpp
diff --git a/src/include/common/rpp/kernel.hpp b/src/include/common/rpp/kernel.hpp
@@ -30,8 +30,6 @@
 #include <string>
 #include <vector>
 
-#include "config.h"
-
 #ifdef HIP_COMPILE
 
 #include "rpp/hipoc_kernel.hpp"

diff --git a/src/include/common/rpp/op_kernel_args.hpp b/src/include/common/rpp/op_kernel_args.hpp
@@ -26,7 +26,6 @@ THE SOFTWARE.
 #include <cstdint>
 #include <half/half.hpp>
 
-#include <boost/container/small_vector.hpp>
 struct OpKernelArg
 {
 
@@ -49,6 +48,6 @@ struct OpKernelArg
     }
 
     std::size_t size() const { return buffer.size(); };
-    boost::container::small_vector<char, 8> buffer;
+    std::vector<char> buffer;
     bool is_ptr = false;
 };
diff --git a/src/include/common/rpp/tmp_dir.hpp b/src/include/common/rpp/tmp_dir.hpp
@@ -24,15 +24,15 @@ THE SOFTWARE.
 #define GUARD_RPP_TMP_DIR_HPP
 
 #include <string>
-#include <boost/filesystem/path.hpp>
+#include "filesystem.h"
 
 namespace rpp {
 
 void SystemCmd(std::string cmd);
 
 struct TmpDir
 {
-    boost::filesystem::path path;
+    fs::path path;
     TmpDir(std::string prefix);
 
     TmpDir(TmpDir const&) = delete;