Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions projects/rocblas/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ rocBLAS documentation is available at
* Reduced the default verbosity level for internal GEMM backend information
* Updated from the deprecated rocm-cmake to ROCmCMakeBuildTools
* Corrected AlmaLinux gfortran package dependencies
* Included upgrade of `packaging` in addition to `pip` in Tensile Virtual Environment to stabilize `setuptools` from failures

### Upcoming changes

Expand Down
9 changes: 9 additions & 0 deletions projects/rocblas/cmake/virtualenv.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,15 @@ function(virtualenv_install)
if(rc)
message(FATAL_ERROR ${rc})
endif()

message("${VIRTUALENV_BIN_DIR}/${VIRTUALENV_PYTHON_EXENAME} -m pip install --upgrade packaging")
execute_process(
RESULT_VARIABLE rc
COMMAND ${VIRTUALENV_BIN_DIR}/${VIRTUALENV_PYTHON_EXENAME} -m pip install --upgrade packaging
)
if(rc)
message(FATAL_ERROR ${rc})
endif()
endif()

message("${VIRTUALENV_BIN_DIR}/${VIRTUALENV_PYTHON_EXENAME} -m pip install ${ARGN}")
Expand Down
2 changes: 1 addition & 1 deletion projects/rocblas/docs/install/Linux_Install_Guide.rst
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ shown in the table below:

"``./install.sh -h``", "Help information."
"``./install.sh -d``", "Build the library dependencies and library in your local directory. The ``-d`` flag only needs to be used once. For subsequent invocations of ``install.sh``, it is not necessary to rebuild the dependencies."
"``./install.sh --upgrade_tensile_venv_pip``", "On RPM-based Linux distributions it may be required to upgrade ``pip`` for the build to succeed."
"``./install.sh --upgrade_tensile_venv_pip``", "On RPM-based Linux distributions it may be required to upgrade ``pip`` or ``packaging`` for the build to succeed."
"``./install.sh``", "Build the library in your local directory. It is assumed the dependencies have been built."
"``./install.sh -i``", "Build the library, then build and install the rocBLAS package in ``/opt/rocm/rocblas``. You will be prompted for ``sudo`` access. This installs it for all users. To keep rocBLAS in your local directory, do not use the ``-i`` flag."

Expand Down
2 changes: 1 addition & 1 deletion projects/rocblas/rmake.py
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ def parse_args():
help='Use a local path for HipBLASLt (optional)')

general_opts.add_argument( '--upgrade_tensile_venv_pip', required=False, default=False, action='store_true',
help='Upgrade python pip version during Tensile installation (optional, default: False)')
help='Upgrade python pip and packaging versions during Tensile installation (optional, default: False)')

experimental_opts.add_argument('-u', '--use-custom-version', dest='tensile_version', type=str, required=False, default="",
help='Ignore Tensile version and just use the Tensile tag (optional)')
Expand Down