diff --git a/docker/rocm/Dockerfile b/docker/rocm/Dockerfile index a1d6ce832..0c4d83a93 100644 --- a/docker/rocm/Dockerfile +++ b/docker/rocm/Dockerfile @@ -2,7 +2,7 @@ # https://askubuntu.com/questions/972516/debian-frontend-environment-variable ARG DEBIAN_FRONTEND=noninteractive -ARG ROCM=5.7.3 +ARG ROCM=6.2.1 ARG AMDGPU=gfx900 ARG HSA_OVERRIDE_GFX_VERSION ARG HSA_OVERRIDE @@ -23,11 +23,12 @@ COPY docker/rocm/rocm-pin-600 /etc/apt/preferences.d/ RUN apt-get update -RUN apt-get -y install --no-install-recommends migraphx hipfft roctracer +RUN apt-get -y install --no-install-recommends migraphx hipfft roctracer rocprofiler-register miopen-hip RUN apt-get -y install --no-install-recommends migraphx-dev -RUN mkdir -p /opt/rocm-dist/opt/rocm-$ROCM/lib -RUN cd /opt/rocm-$ROCM/lib && cp -dpr libMIOpen*.so* libamd*.so* libhip*.so* libhsa*.so* libmigraphx*.so* librocm*.so* librocblas*.so* libroctracer*.so* librocfft*.so* /opt/rocm-dist/opt/rocm-$ROCM/lib/ +RUN mkdir -p /opt/rocm-dist/opt/rocm-$ROCM/lib/migraphx/lib +RUN cd /opt/rocm-$ROCM/lib && cp -dpr libMIOpen*.so* libamd*.so* libhip*.so* libhsa*.so* librocm*.so* librocblas*.so* libroctracer*.so* libroctx64*.so* librocfft*.so* librocprofiler-register*.so* /opt/rocm-dist/opt/rocm-$ROCM/lib/ +RUN cd /opt/rocm-$ROCM/lib/migraphx/lib && cp -dpr libmigraphx*.so* /opt/rocm-dist/opt/rocm-$ROCM/lib/migraphx/lib/ RUN cd /opt/rocm-dist/opt/ && ln -s rocm-$ROCM rocm RUN mkdir -p /opt/rocm-dist/etc/ld.so.conf.d/ diff --git a/docker/rocm/migraphx/CMakeLists.txt b/docker/rocm/migraphx/CMakeLists.txt index 271dd094b..b490855cd 100644 --- a/docker/rocm/migraphx/CMakeLists.txt +++ b/docker/rocm/migraphx/CMakeLists.txt @@ -13,12 +13,12 @@ SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) project(migraphx_py) -include_directories(/opt/rocm/include) +include_directories(/opt/rocm/include /opt/rocm/lib/migraphx/include) find_package(pybind11 REQUIRED) pybind11_add_module(migraphx migraphx_py.cpp) -target_link_libraries(migraphx PRIVATE /opt/rocm/lib/libmigraphx.so /opt/rocm/lib/libmigraphx_tf.so /opt/rocm/lib/libmigraphx_onnx.so) +target_link_libraries(migraphx PRIVATE /opt/rocm/lib/migraphx/lib/libmigraphx.so.2010000 /opt/rocm/lib/migraphx/lib/libmigraphx_tf.so.2010000 /opt/rocm/lib/migraphx/lib/libmigraphx_onnx.so.2010000) install(TARGETS migraphx COMPONENT python diff --git a/docker/rocm/migraphx/migraphx_py.cpp b/docker/rocm/migraphx/migraphx_py.cpp index 894c9d186..a295f1132 100644 --- a/docker/rocm/migraphx/migraphx_py.cpp +++ b/docker/rocm/migraphx/migraphx_py.cpp @@ -554,7 +554,7 @@ MIGRAPHX_PYBIND11_MODULE(migraphx, m) a.fill(values.begin(), values.end()); return a; }); - m.def("generate_argument", &migraphx::generate_argument, py::arg("s"), py::arg("seed") = 0); + m.def("generate_argument", &migraphx::generate_argument, py::arg("s"), py::arg("seed") = 0,py::arg("random_mode::random")); m.def("fill_argument", &migraphx::fill_argument, py::arg("s"), py::arg("value")); m.def("quantize_fp16", &migraphx::quantize_fp16, diff --git a/docker/rocm/rocm.hcl b/docker/rocm/rocm.hcl index 33a2d2323..9123b072b 100644 --- a/docker/rocm/rocm.hcl +++ b/docker/rocm/rocm.hcl @@ -2,7 +2,7 @@ variable "AMDGPU" { default = "gfx900" } variable "ROCM" { - default = "5.7.3" + default = "6.2.1" } variable "HSA_OVERRIDE_GFX_VERSION" { default = "" diff --git a/docker/rocm/rocm.list b/docker/rocm/rocm.list index 0915b4094..10f40cb7a 100644 --- a/docker/rocm/rocm.list +++ b/docker/rocm/rocm.list @@ -1 +1 @@ -deb [arch=amd64 signed-by=/etc/apt/keyrings/rocm.gpg] https://repo.radeon.com/rocm/apt/5.7.3 focal main +deb [arch=amd64 signed-by=/etc/apt/keyrings/rocm.gpg] https://repo.radeon.com/rocm/apt/6.2.1 focal main