diff --git a/docs/conf.py b/docs/conf.py index 1c87e5aa..93f19395 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -5,12 +5,12 @@ # https://www.sphinx-doc.org/en/master/usage/configuration.html # ROCm version numbers -rocm_version = '6.2.2' -rocm_multi_versions = '6.2.2 6.2.1' # in 6.2, the folder names on repo.radeon.com use 6.2 for minor releases -rocm_multi_versions_package_versions = '6.2.2 6.2.1' # however, in multi, the packages use 6.2.0 -rocm_directory_version = '6.2.2' # in 6.0 rocm was located in /opt/rocm-6.0.0 -amdgpu_version = '6.2.2' # directory in https://repo.radeon.com/rocm/apt/ and https://repo.radeon.com/amdgpu-install/ -amdgpu_install_version = '6.2.60202-1' # version in https://repo.radeon.com/amdgpu-install/6.0.2/ubuntu/jammy/ +rocm_version = '6.2.4' +rocm_multi_versions = '6.2.4 6.2.2' # in 6.2, the folder names on repo.radeon.com use 6.2 for minor releases +rocm_multi_versions_package_versions = '6.2.4 6.2.2' # however, in multi, the packages use 6.2.0 +rocm_directory_version = '6.2.4' # in 6.0 rocm was located in /opt/rocm-6.0.0 +amdgpu_version = '6.2.4' # directory in https://repo.radeon.com/rocm/apt/ and https://repo.radeon.com/amdgpu-install/ +amdgpu_install_version = '6.2.60204-1' # version in https://repo.radeon.com/amdgpu-install/6.0.2/ubuntu/jammy/ latex_engine = "xelatex" @@ -26,8 +26,8 @@ project = "ROCm installation on Linux" author = "Advanced Micro Devices, Inc." copyright = "Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved." -version = "6.2.2" -release = "6.2.2" +version = "6.2.4" +release = "6.2.4" setting_all_article_info = True all_article_info_os = ["linux"] all_article_info_author = "" diff --git a/docs/reference/system-requirements.rst b/docs/reference/system-requirements.rst index aab7091e..75322834 100644 --- a/docs/reference/system-requirements.rst +++ b/docs/reference/system-requirements.rst @@ -44,6 +44,7 @@ Accelerators and GPUs listed in the following table support compute workloads (n :widths: 50, 25, 25, 10 :header: "GPU", "Architecture", "LLVM target", "Support" + "AMD Radeon PRO V710", "RDNA3", "gfx1101", "✅" "AMD Radeon PRO W7900 Dual Slot", "RDNA3", "gfx1100", "✅" "AMD Radeon PRO W7900", "RDNA3", "gfx1100", "✅" "AMD Radeon PRO W7800", "RDNA3", "gfx1100", "✅" diff --git a/src/offline-installer/CMakeLists.txt b/src/offline-installer/CMakeLists.txt index e4f485c5..699323bd 100755 --- a/src/offline-installer/CMakeLists.txt +++ b/src/offline-installer/CMakeLists.txt @@ -176,6 +176,8 @@ set(IS_ROCM_611_DISABLED 0) set(IS_ROCM_612_DISABLED 0) set(IS_ROCM_613_DISABLED 0) set(IS_ROCM_62_DISABLED 0) +set(IS_ROCM_621_DISABLED 0) +set(IS_ROCM_622_DISABLED 0) # Disable ROCm tests older than 6.2 for sles 15.6, rhel 8.10, rhel 9.4 and ubuntu 24.04 if (IS_SLES_156 OR IS_RHEL_810 OR IS_RHEL_94 OR IS_UBUNTU_2404) @@ -218,7 +220,7 @@ add_custom_target(rocm_offline_creator ALL COMMAND echo "Copy the help_menus directory" COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/UI/help_menus ${SCRIPT_DIRECTORY}/help_menus/ COMMAND echo "Building rocm_offline_creator" - COMMAND makeself ${MAKESELF_OPTIONS} ${SCRIPT_DIRECTORY} ${PACKAGE_NAME}.run "ROCm Offline Install Creator" ./offline_init.sh) + COMMAND makeself ${MAKESELF_OPTIONS} --nox11 ${SCRIPT_DIRECTORY} ${PACKAGE_NAME}.run "ROCm Offline Install Creator" ./offline_init.sh) # UI add_subdirectory(UI) diff --git a/src/offline-installer/README.md b/src/offline-installer/README.md index ffd3a547..380b6401 100644 --- a/src/offline-installer/README.md +++ b/src/offline-installer/README.md @@ -32,18 +32,22 @@ The offline tool is designed to support the follow list of Linux Distros: ROCm versions enabled for each distro. -| OS Name | 5.7.3 | 6.0 | 6.0.1 | 6.0.2 | 6.0.3 | 6.1 | 6.1.1 | 6.1.2 | 6.1.3 | 6.2 | -| :--- | :----: | :----: | :----: | :----: | :----:| :----: | :----: | :----: | :----: | :----: | -| Ubuntu 20.04 | Yes | Yes | Yes | Yes | Yes | Yes | Yes | Yes | Yes | Yes | -| Ubuntu 22.04 | Yes | Yes | Yes | Yes | Yes | Yes | Yes | Yes | Yes | Yes | -| Ubuntu 24.04 | No | No | No | No | No | No | No | No | No | Yes | -| Rhel 8.9 | No | Yes | Yes | Yes | Yes | Yes | Yes | Yes | Yes | Yes | -| Rhel 8.10 | No | No | No | No | No | No | No | No | No | Yes | -| Rhel 9.2 | Yes | Yes | Yes | Yes | Yes | Yes | Yes | Yes | Yes | Yes | -| Rhel 9.3 | No | Yes | Yes | Yes | Yes | Yes | Yes | Yes | Yes | Yes | -| Rhel 9.4 | No | No | No | No | No | No | No | No | No | Yes | -| Suse 15.5 | Yes | No | No | No | Yes | Yes | Yes | Yes | Yes | Yes | -| Suse 15.6 | No | No | No | No | No | No | No | No | No | Yes | +| OS Name | 5.7.3 | 6.0 | 6.0.1 | 6.0.2 | 6.0.3 | 6.1.x | 6.2.x | +| :--- | :----: | :----: | :----: | :----: | :----:| :----: | :----: | +| Ubuntu 20.04 | Yes | Yes | Yes | Yes | Yes | Yes | Yes | +| Ubuntu 22.04 | Yes | Yes | Yes | Yes | Yes | Yes | Yes | +| Ubuntu 24.04 | No | No | No | No | No | No | Yes | +| Rhel 8.9 | No | Yes | Yes | Yes | Yes | Yes | Yes | +| Rhel 8.10 | No | No | No | No | No | No | Yes | +| Rhel 9.2 | Yes | Yes | Yes | Yes | Yes | Yes | Yes | +| Rhel 9.3 | No | Yes | Yes | Yes | Yes | Yes | Yes | +| Rhel 9.4 | No | No | No | No | No | No | Yes | +| Suse 15.5 | Yes | No | No | No | Yes | Yes | Yes | +| Suse 15.6 | No | No | No | No | No | No | Yes | + +## ROCm Usecases Support Notes + +`multimediasdk` is not supported on ROCm 5.7.3 and on 6.2+ ## Building @@ -162,6 +166,7 @@ The Offline creator tool may also be run with the following options: * prompt : enables user prompts during offline installer creation. * config= : specifies the full path to a .config file containing an offline installer configuration. This parameter is used for testing purposes (see Testing). +* wconfig= : specifies the full path to a .config file that will be created with create settings chosen by user in the GUI and exit without creating an installer package. This paramter is used for testing purposes. For example, to enable user prompts, use the following: @@ -188,20 +193,24 @@ The installer package may also be run with the following options: * prompt : enables user prompts during installion process. * dryrun : simulates the installation process without installing associated packages. +### Log Files + +By default, the Offline Installer creator will record it's execution output to log files located in the /var/log/offline_creator directory. The output of both creation and installation processes will written out to this directory. + ## Testing Testing of the offline creator tool has pre-set tests that maybe run to validate some of common installer configurations simulating and testing the creation of the target offline installer and running of the outputted installer. Tests are based on the ROCm version and on the usecase being installed: -* ROCm Version: `5.7.3, 6.0.2, 6.1, 6.1.1, 6.1.2, 6.1.3, and 6.2` +* ROCm Version: `5.7.3, 6.0.2, 6.1.x, and 6.2.x` * Usecases : `ROCm only, Driver only, ROCm + Driver, rocm + graphics, hip + hiplibsdk` - * ROCm only = Create an installer for the ROCm usecase only. - * Driver only = Create an installer for the amdgpu driver only. - * ROCm + Driver = Create an installer for both the ROCm usecase and the amdgpu driver. - * ROCm,graphics = Create an installer for the rocm,graphics usecase. + * ROCm only = Create an installer for the ROCm usecase only. + * Driver only = Create an installer for the amdgpu driver only. + * ROCm + Driver = Create an installer for both the ROCm usecase and the amdgpu driver. + * ROCm,graphics = Create an installer for the rocm,graphics usecase. * Hip, Hiplibsdk = Create an installer for the hip,hiplibsdk usescase. ### Test Build @@ -226,25 +235,25 @@ From the build location of the offline tool, run the following: ctest ``` -A total of 70 tests will be run: +A total of 90 tests will be run: ROCm Version -* 6.2 : ROCm only, Driver only, ROCm + Driver, ROCm + graphics, hip + hiplibsdk +* 6.2.x: ROCm only, Driver only, ROCm + Driver, ROCm + graphics, hip + hiplibsdk * 6.1.x: ROCm only, Driver only, ROCm + Driver, ROCm + graphics, hip + hiplibsdk * 6.0.2: ROCm only, Driver only, ROCm + Driver, ROCm + graphics, hip + hiplibsdk * 5.7.3: ROCm only, Driver only, ROCm + Driver, ROCm + graphics, hip + hiplibsdk #### ROCm Version Test -Subsets of the “Full” test can be selected and run via Ctest for specific versions of ROCm (5.7.3, 6.0.2, 6.1, etc.). +Subsets of the “Full” test can be selected and run via Ctest for specific versions of ROCm (5.7.3, 6.0.2, 6.1.0, etc.). From the build location of the offline tool, run the following: ``` shell ctest -L ``` -rocm-version = 5.7.3, 6.0.2, 6.1, 6.1.1, 6.1.2, 6.1.3, or 6.2 +rocm-version = 5.7.3, 6.0.2, 6.1.x, or 6.2.x #### CI Test @@ -260,18 +269,18 @@ ctest -L ci A matrix describing what ROCm ctests are enabled for each distro. NOTE: There are no ctests for rocm versions 6.0.0, 6.0.1 and 6.0.3 -| OS Name | 5.7.3 | 6.0.2 | 6.1 | 6.1.1 | 6.1.2 | 6.1.3 | 6.2 | -| :--- | :----: | :----:| :----: | :----: | :----: | :----: | :----: | -| Ubuntu 20.04 | Yes | Yes | Yes | Yes | Yes | Yes | Yes | -| Ubuntu 22.04 | Yes | Yes | Yes | Yes | Yes | Yes | Yes | -| Ubuntu 24.04 | No | No | No | No | No | No | Yes | -| Rhel 8.9 | No | Yes | Yes | Yes | Yes | Yes | Yes | -| Rhel 8.10 | No | No | No | No | No | No | Yes | -| Rhel 9.2 | Yes | Yes | Yes | Yes | Yes | Yes | Yes | -| Rhel 9.3 | No | Yes | Yes | Yes | Yes | Yes | Yes | -| Rhel 9.4 | No | No | No | No | No | No | Yes | -| Suse 15.5 | Yes | Yes | Yes | Yes | Yes | Yes | Yes | -| Suse 15.6 | No | No | No | No | No | No | Yes | +| OS Name | 5.7.3 | 6.0.2 | 6.1.x | 6.2.x | +| :--- | :----: | :----: | :----: | :----: | +| Ubuntu 20.04 | Yes | Yes | Yes | Yes | +| Ubuntu 22.04 | Yes | Yes | Yes | Yes | +| Ubuntu 24.04 | No | No | No | Yes | +| Rhel 8.9 | No | Yes | Yes | Yes | +| Rhel 8.10 | No | No | No | Yes | +| Rhel 9.2 | Yes | Yes | Yes | Yes | +| Rhel 9.3 | No | Yes | Yes | Yes | +| Rhel 9.4 | No | No | No | Yes | +| Suse 15.5 | Yes | Yes | Yes | Yes | +| Suse 15.6 | No | No | No | Yes | ### Test Run using .config diff --git a/src/offline-installer/UI/src/config.h b/src/offline-installer/UI/src/config.h index f90d1cf2..2ab6a0a1 100644 --- a/src/offline-installer/UI/src/config.h +++ b/src/offline-installer/UI/src/config.h @@ -25,7 +25,9 @@ #include "install_types.h" // Menus default installer type -#define DEFAULT_INSTALLER_TYPE eINSTALL_TYPE_REPO_PUBLIC +#define DEFAULT_INSTALLER_TYPE eINSTALL_TYPE_REPO_PUBLIC + +#define INSTALLER_CREATION_LOG_SIZE 50 // /var/log/offline_creator/create_[UNIX_TIME].log /* Create Menu Configuration ************************************************************************/ @@ -61,6 +63,7 @@ typedef struct _CREATE_MENU_CONFIG char installer_name[256]; char installer_name_with_extension[260]; + char installer_creation_log_out_location[INSTALLER_CREATION_LOG_SIZE]; char installer_out_location[256]; bool is_installer_loc_valid; diff --git a/src/offline-installer/UI/src/create_menu.c b/src/offline-installer/UI/src/create_menu.c index 011c3cee..ada315c6 100644 --- a/src/offline-installer/UI/src/create_menu.c +++ b/src/offline-installer/UI/src/create_menu.c @@ -23,6 +23,7 @@ #include "help_menu.h" #include "utils.h" +#include #include #include #include @@ -50,7 +51,7 @@ char *createMenuDesc[] = { CREATE_MENU_ITEM_DEP_DOWNLOAD_FULL_DESC, " ", "Output name for the created offline installer. A .run extension will be added to the filename.", - "Output location for the created offline installer", + "Output location for the created offline installer.", " ", DEFAULT_VERBOSE_HELP_WINDOW_MSG, "Exit to Main Menu", @@ -168,6 +169,7 @@ void create_config_menu_window(MENU_DATA *pMenuData, WINDOW *pMenuWindow, OFFLIN pCreateConfig->currentInstallDLType = eDL_TYPE_FULL; sprintf(pCreateConfig->installer_name, "%s", CREATE_MENU_DEFAULT_INSTALLER_NAME); sprintf(pCreateConfig->installer_name_with_extension, "%s.run", CREATE_MENU_DEFAULT_INSTALLER_NAME); + sprintf(pCreateConfig->installer_creation_log_out_location, "%s/create_%lu.log", CREATE_MENU_INSTALLER_LOG_OUT_PATH, time(NULL)); sprintf(pCreateConfig->installer_out_location, "%s", get_home_directory()); pCreateConfig->is_installer_loc_valid = true; // home directory is valid @@ -181,6 +183,7 @@ void create_config_menu_window(MENU_DATA *pMenuData, WINDOW *pMenuWindow, OFFLIN menu_set_item_select(pMenuData, CREATE_MENU_ITEM_INSTALLER_INPUT_INDEX, false); // installer input menu_set_item_select(pMenuData, CREATE_MENU_ITEM_REPO_TYPE_INDEX, false); // repo menu_set_item_select(pMenuData, 2, false); // space after repo + menu_set_item_select(pMenuData, CREATE_MENU_ITEM_DEP_DOWNLOAD_INDEX, !is_rocm_installed()); // dependency download type menu_set_item_select(pMenuData, 4, false); // space after dep menu_set_item_select(pMenuData, pMenuData->itemList[0].numItems - 4, false); // space before @@ -196,6 +199,8 @@ void create_config_menu_window(MENU_DATA *pMenuData, WINDOW *pMenuWindow, OFFLIN set_field_buffer(pMenuData->pFormList.field[0], 0, CREATE_MENU_DEFAULT_INSTALLER_NAME); set_field_buffer(pMenuData->pFormList.field[1], 0, pCreateConfig->installer_out_location); + + pMenuData->clearErrMsgAfterUpOrDownKeyPress = true; } void destroy_config_menu_window(MENU_DATA *pMenuData) @@ -211,7 +216,7 @@ void create_menu_draw(MENU_DATA *pMenuData) OFFLINE_INSTALL_CONFIG *pConfig = pMenuData->pConfig; CREATE_MENU_CONFIG *pCreateConfig = &pConfig->create_confg; - char drawName[256]; + char drawName[DEFAULT_CHAR_SIZE]; // draw the installer input type/repo wmove(pMenuWindow, CREATE_MENU_ITEM_INSTALLER_INPUT_ROW, CREATE_MENU_FORM_COL); @@ -253,7 +258,7 @@ void create_menu_draw(MENU_DATA *pMenuData) wattron(pMenuWindow, COLOR_PAIR(4)); mvwprintw(pMenuWindow, CREATE_MENU_ITEM_DEP_DOWNLOAD_ROW, CREATE_MENU_FORM_COL, "%s", createMenuDLTypes[pCreateConfig->currentInstallDLType].download_dep_name); wattroff(pMenuWindow, COLOR_PAIR(4)); - + // draw the main create menu menu_draw(pMenuData); } @@ -286,6 +291,8 @@ void do_create_menu(MENU_DATA *pMenuData) { MENU *pMenu = pMenuData->pMenu; + wclear(pMenuData->pMenuWindow); + // draw the create menu contents create_menu_draw(pMenuData); @@ -312,6 +319,10 @@ void process_create_menu(MENU_DATA *pMenuData) DEBUG_UI_MSG(pMenuData, "create menu: item %d", curMenuItemIndex); + bool isSelectable = item_opts(pCurrentItem) == O_SELECTABLE; + + if (!isSelectable) return; + if (pForm) { ptrFormFnc = form_userptr(pForm); @@ -384,6 +395,10 @@ void process_create_menu_item(MENU_DATA *pMenuData) // dependency download type else if (curMenuItemIndex == 3) { + if (is_rocm_installed()) + { + print_menu_warning_msg(pMenuData, DOWNLOAD_DEP_WARN_ERR_START_Y, DOWNLOAD_DEP_WARN_ERR_START_X, "'minimum' unavailable when ROCm is installed on host."); + } if (pCreateConfig->currentInstallDLType == eDL_TYPE_FULL) { print_menu_item_selection_opt(pMenuData, MENU_SEL_START_Y, MENU_SEL_START_X, CREATE_MENU_ITEM_DEP_DOWNLOAD_FULL_DESC); diff --git a/src/offline-installer/UI/src/create_menu.h b/src/offline-installer/UI/src/create_menu.h index c508b584..17f1b21e 100644 --- a/src/offline-installer/UI/src/create_menu.h +++ b/src/offline-installer/UI/src/create_menu.h @@ -52,6 +52,12 @@ #define CREATE_MENU_DEFAULT_INSTALLER_NAME "rocm-offline-install" +#define CREATE_MENU_INSTALLER_LOG_OUT_PATH "/var/log/offline_creator" + + +// warning message for download dependency minimum restriction +#define DOWNLOAD_DEP_WARN_ERR_START_Y WARN_ERR_START_Y + 1 +#define DOWNLOAD_DEP_WARN_ERR_START_X WARN_ERR_START_X // item descriptions for options within specific menu items #define CREATE_MENU_ITEM_INSTALLER_INPUT_PUBLIC_DESC "Input source for packages used in offline installer creation. 'repo-public' provides packages from repo.radeon.com" diff --git a/src/offline-installer/UI/src/driver_menu.c b/src/offline-installer/UI/src/driver_menu.c index b090d5ef..a37b7c7a 100644 --- a/src/offline-installer/UI/src/driver_menu.c +++ b/src/offline-installer/UI/src/driver_menu.c @@ -243,6 +243,7 @@ void do_driver_menu(MENU_DATA *pMenuData) { MENU *pMenu = pMenuData->pMenu; + wclear(pMenuData->pMenuWindow); driver_menu_toggle_grey_items(pMenuData); @@ -281,7 +282,7 @@ void process_driver_menu(MENU_DATA *pMenuData) menu_info_draw_bool(pMenuData, DRIVER_MENU_ITEM_INSTALL_DRIVER_ROW, DRIVER_MENU_FORM_COL, pDriverConfig->install_driver); if (!pDriverConfig->install_driver && is_specific_usecase_selected(pMenuData, "workstation")) { - print_menu_warning_msg(pMenuData, "workstation is not supported when install driver is set to no"); + print_menu_warning_msg(pMenuData, WARN_ERR_START_Y, WARN_ERR_START_X, "workstation is not supported when install driver is set to no"); } else { diff --git a/src/offline-installer/UI/src/extras_menu.c b/src/offline-installer/UI/src/extras_menu.c index 07b91ed6..d7923680 100644 --- a/src/offline-installer/UI/src/extras_menu.c +++ b/src/offline-installer/UI/src/extras_menu.c @@ -174,6 +174,8 @@ void do_extras_menu(MENU_DATA *pMenuData) { MENU *pMenu = pMenuData->pMenu; + wclear(pMenuData->pMenuWindow); + // draw the extras menu contents extras_menu_draw(pMenuData); diff --git a/src/offline-installer/UI/src/menu_data.c b/src/offline-installer/UI/src/menu_data.c index 52a887ce..a7a6b90e 100644 --- a/src/offline-installer/UI/src/menu_data.c +++ b/src/offline-installer/UI/src/menu_data.c @@ -372,7 +372,6 @@ void menu_loop(MENU_DATA *pMenuData) break; } - print_version(pMenuData); wrefresh(pMenuWindow); } } @@ -410,9 +409,10 @@ void menu_draw(MENU_DATA *pMenuData) set_item_value(items[i], true); add_menu_item_selection_mark(pMenuData, items[i]); } - } } + + print_version(pMenuData); } void menu_info_draw_bool(MENU_DATA *pMenuData, int starty, int startx, bool val) @@ -554,7 +554,7 @@ void print_menu_item_selection(MENU_DATA *pMenuData, int starty, int startx) void print_menu_selections(MENU_DATA *pMenuData) { - char temp[200]; + char temp[DEFAULT_CHAR_SIZE]; ITEM **items; int i; @@ -581,12 +581,9 @@ void print_version(MENU_DATA *pMenuData) mvwprintw(pMenuData->pMenuWindow, 28, 72, "v%s-%s", OFFLINE_VERSION, ROCM_VERSION); } -void print_menu_warning_msg(MENU_DATA *pMenuData, const char *fmt, ...) +void print_menu_warning_msg(MENU_DATA *pMenuData, int y, int x, const char *fmt, ...) { - WINDOW *pMenuWindow = pMenuData->pMenuWindow; - - int x = WARN_ERR_START_X; - int y = WARN_ERR_START_Y; + WINDOW *pMenuWindow = pMenuData->pMenuWindow; va_list args; va_start(args, fmt); @@ -908,7 +905,7 @@ bool is_specific_usecase_selected(MENU_DATA *pMenuData, char *usecase) char *p = strtok (copy, ","); // split rocm_usecases char string into a string array using , as delimiter - char *rocm_usecases_array[256]; + char *rocm_usecases_array[DEFAULT_CHAR_SIZE]; int i = 0; while (p != NULL) @@ -964,7 +961,7 @@ int display_scroll_window(char *filename, char *query_string, char *query_pass, int max_win_lines = WIN_NUM_LINES - 3; int query_line = max_win_lines + 1; - char query[16]; + char query[DISPLAY_SCROLL_WINDOW_QUERY_SIZE]; memset(query, '\0', sizeof(query)); FILE *file = fopen(filename, "r"); diff --git a/src/offline-installer/UI/src/menu_data.h b/src/offline-installer/UI/src/menu_data.h index 923457f4..2aa138fe 100644 --- a/src/offline-installer/UI/src/menu_data.h +++ b/src/offline-installer/UI/src/menu_data.h @@ -65,6 +65,8 @@ #define CTRL(x) ((x) & 0x1F) #define UNUSED(x) (void)(x) +#define DISPLAY_SCROLL_WINDOW_QUERY_SIZE 16 + // Structure defining propertie for a menu typedef struct _MENU_PROP @@ -173,7 +175,7 @@ void print_version(MENU_DATA *pMenuData); void print_menu_err_msg(MENU_DATA *pMenuData, const char *fmt, ...); void clear_menu_err_msg(MENU_DATA *pMenuData); void print_menu_dbg_msg(MENU_DATA *pMenuData, const char *fmt, ...); -void print_menu_warning_msg(MENU_DATA *pMenuData, const char *fmt, ...); +void print_menu_warning_msg(MENU_DATA *pMenuData, int y, int x, const char *fmt, ...); void print_menu_control_msg(MENU_DATA *pMenuData); bool print_url_check(MENU_DATA *pMenuData, char *url); void remove_menu_item_selection_description(MENU_DATA *pMenuData, int starty, int startx); diff --git a/src/offline-installer/UI/src/rocm_menu.c b/src/offline-installer/UI/src/rocm_menu.c index acc6a5ca..b314a3b1 100644 --- a/src/offline-installer/UI/src/rocm_menu.c +++ b/src/offline-installer/UI/src/rocm_menu.c @@ -158,6 +158,8 @@ char *rocmVersionsNameIndexMapping[] = { "6.1.2", "6.1.3", "6.2", + "6.2.1", + "6.2.2", (char*)NULL, }; @@ -172,6 +174,8 @@ char *rocmVersionsDescIndexMapping[] = { "Install ROCm 6.1.2", "Install ROCm 6.1.3", "Install ROCm 6.2", + "Install ROCm 6.2.1", + "Install ROCm 6.2.2", (char*)NULL, }; @@ -191,17 +195,18 @@ char *distroOSVersionsIndexMapping[] = { // Each column corresponds to a specific rocm version specified in array rocmVersionsDescIndexMapping +// First column maps to 5.7.3, second maps to 6.0,..., last column maps to 6.2.2 int rocmVersionsMatrix[ROCM_VERS_ROWS][ROCM_VERS_COLS] = { - {1,1,1,1,1,1,1,1,1,1}, // Ubuntu 20.04 - {1,1,1,1,1,1,1,1,1,1}, // Ubuntu 22.04 - {0,0,0,0,0,0,0,0,0,1}, // Ubuntu 24.04 - {0,1,1,1,1,1,1,1,1,1}, // rhel 8.9 - {0,0,0,0,0,0,0,0,0,1}, // rhel 8.10 - {1,1,1,1,1,1,1,1,1,1}, // rhel 9.2 - {0,1,1,1,1,1,1,1,1,1}, // rhel 9.3 - {0,0,0,0,0,0,0,0,0,1}, // rhel 9.4 - {1,1,1,1,1,1,1,1,1,1}, // sles 15.5 - {0,0,0,0,0,0,0,0,0,1}, // sles 15.6 + {1,1,1,1,1,1,1,1,1,1,1,1}, // Ubuntu 20.04 + {1,1,1,1,1,1,1,1,1,1,1,1}, // Ubuntu 22.04 + {0,0,0,0,0,0,0,0,0,1,1,1}, // Ubuntu 24.04 + {0,1,1,1,1,1,1,1,1,1,1,1}, // rhel 8.9 + {0,0,0,0,0,0,0,0,0,1,1,1}, // rhel 8.10 + {1,1,1,1,1,1,1,1,1,1,1,1}, // rhel 9.2 + {0,1,1,1,1,1,1,1,1,1,1,1}, // rhel 9.3 + {0,0,0,0,0,0,0,0,0,1,1,1}, // rhel 9.4 + {1,1,1,1,1,1,1,1,1,1,1,1}, // sles 15.5 + {0,0,0,0,0,0,0,0,0,1,1,1}, // sles 15.6 }; char **rocmVersions = NULL; @@ -333,12 +338,13 @@ void rocm_menu_draw(MENU_DATA *pMenuData) { WINDOW *pMenuWindow = pMenuData->pMenuWindow; ROCM_MENU_CONFIG *pConfig = &(pMenuData->pConfig)->rocm_config; + if (pConfig->rocm_version_selected && pConfig->install_rocm) { menu_set_item_select(pMenuData, ROCM_MENU_ITEM_USECASES_INDEX, true); } - char drawName[256]; + char drawName[DEFAULT_CHAR_SIZE]; menu_info_draw_bool(pMenuData, ROCM_MENU_ITEM_INSTALL_ROCM_ROW, ROCM_MENU_FORM_COL, pConfig->install_rocm); @@ -364,7 +370,6 @@ void rocm_menu_submenu_draw(MENU_DATA *pMenuData) { wclear(pMenuData->pMenuWindow); menu_draw(pMenuData); - print_version(pMenuData); } void rocm_menu_toggle_grey_items(MENU_DATA *pMenuData, bool enable) @@ -431,6 +436,8 @@ void do_rocm_menu(MENU_DATA *pMenuData) { MENU *pMenu = pMenuData->pMenu; + wclear(pMenuData->pMenuWindow); + bool isRocmStackSelected = is_specific_usecase_selected(pMenuData, ROCM_USECASE); // draw the ROCm menu contents @@ -629,7 +636,7 @@ void process_rocm_usecase_menu(MENU_DATA *pMenuData) { if (!isMultimediasdkEnabled) { - print_menu_warning_msg(pMenuData, "not supported on ROCm version %s", selectedROCMVersion); + print_menu_warning_msg(pMenuData, WARN_ERR_START_Y, WARN_ERR_START_X, "not supported on ROCm version %s", selectedROCMVersion); } } } @@ -833,9 +840,17 @@ bool is_ubuntu_2004(MENU_DATA *pMenuData) return is_distro_id_and_distro_version(pMenuData, "ubuntu", "20.04"); } +// multimedia supported on all rocm versions except 5.7.3 and 6.2+ bool is_mutlimediasdk_enabled(const char *ROCMVersion) { - return strcmp(ROCMVersion, "5.7.3") == 0 ? false : true; + bool is_supported = true; + if ( strcmp(ROCMVersion, "5.7.3") == 0 || + strcmp(ROCMVersion, "6.2") > 0 || strcmp(ROCMVersion, "6.2") == 0 ) + { + is_supported = false; + } + + return is_supported; } bool is_rocm_version_empty(MENU_DATA *pMenuData) @@ -878,10 +893,10 @@ void process_rocm_version_menu(MENU_DATA *pMenuData) int disabledUsecasesCount = 0; bool isMultimediasdkSelected = is_specific_usecase_selected(pMenuData, "multimediasdk"); - char disabledUsecases[256]; - char printDisabledUsecases[256]; - memset(disabledUsecases, '\0', 256); - memset(printDisabledUsecases, '\0', 256); + char disabledUsecases[DEFAULT_CHAR_SIZE]; + char printDisabledUsecases[DEFAULT_CHAR_SIZE]; + memset(disabledUsecases, '\0', DEFAULT_CHAR_SIZE); + memset(printDisabledUsecases, '\0', DEFAULT_CHAR_SIZE); ITEM *pCurrentItem = current_item(pMenu); const char *selectedROCMVersion = item_name(pCurrentItem); @@ -895,7 +910,7 @@ void process_rocm_version_menu(MENU_DATA *pMenuData) { strncpy(printDisabledUsecases, disabledUsecases, strlen(disabledUsecases)-1); const char *verb = (disabledUsecasesCount > 1) ? "are" : "is"; - print_menu_warning_msg(pMenuData, "%s %s not supported on %s.", printDisabledUsecases, verb, selectedROCMVersion); + print_menu_warning_msg(pMenuData, WARN_ERR_START_Y, WARN_ERR_START_X, "%s %s not supported on %s.", printDisabledUsecases, verb, selectedROCMVersion); } } @@ -956,7 +971,7 @@ int getDistroOSVerionIndex(char *distroOSVersion) int getRocmVersionOpsArray(MENU_DATA *pMenuData, char *rocmMenuVersionOps[], char *rocmMenuVersionDesc[], OFFLINE_INSTALL_CONFIG *pConfig) { int index = 0; - char distroOSVersion[256]; + char distroOSVersion[DEFAULT_CHAR_SIZE]; sprintf(distroOSVersion, "%s%s",pConfig->distroID, pConfig->distroVersion); diff --git a/src/offline-installer/UI/src/rocm_menu.h b/src/offline-installer/UI/src/rocm_menu.h index e547c027..c582ad46 100644 --- a/src/offline-installer/UI/src/rocm_menu.h +++ b/src/offline-installer/UI/src/rocm_menu.h @@ -57,9 +57,9 @@ // definitions for rocm verions matrix #define ROCM_VERS_ROWS 10 -#define ROCM_VERS_COLS 10 +#define ROCM_VERS_COLS 12 // Number of rocm versions displayed in variable rocmVersionsNameIndexMapping -#define ROCM_VERS_MENU_MAX_SIZE 13 +#define ROCM_VERS_MENU_MAX_SIZE 14 void create_rocm_menu_window(MENU_DATA *pMenuData, WINDOW *pMenuWindow, OFFLINE_INSTALL_CONFIG *pConfig); diff --git a/src/offline-installer/UI/src/rocm_offline_ui.c b/src/offline-installer/UI/src/rocm_offline_ui.c index a3d76355..9b74e187 100644 --- a/src/offline-installer/UI/src/rocm_offline_ui.c +++ b/src/offline-installer/UI/src/rocm_offline_ui.c @@ -27,8 +27,11 @@ #include "config.h" #include "utils.h" +#include #include +#include +#define SYSTEM_INFO_CHAR_SIZE 512 // Structure defining the menus (menu data) objects making up the offline installer UI typedef struct _OFFLINE_INSTALL_MENUS @@ -41,6 +44,12 @@ typedef struct _OFFLINE_INSTALL_MENUS MENU_DATA menuSummary; }OFFLINE_INSTALL_MENUS; +typedef struct _ARGS_INFO +{ + char wconfig[DEFAULT_CHAR_SIZE]; + bool isWconfig; + char createArgs[DEFAULT_CHAR_SIZE]; +}ARGS_INFO; // Main Menu Setup char *mainMenuOps[] = { @@ -71,7 +80,7 @@ MENU_PROP mainMenuProperties = { .numLines = ARRAY_SIZE(mainMenuOps) - 1, .numCols = MAX_MENU_ITEM_COLS, .startx = 1, - .starty = 6, + .starty = 8, .numItems = ARRAY_SIZE(mainMenuOps) }; @@ -173,7 +182,7 @@ int get_os_info(OFFLINE_INSTALL_CONFIG *pConfig) void main_menu_draw(MENU_DATA *pMenuData, OFFLINE_INSTALL_CONFIG *pConfig) { - char systemInfo[512] = {0}; + char systemInfo[SYSTEM_INFO_CHAR_SIZE] = {0}; wclear(pMenuData->pMenuWindow); @@ -181,10 +190,14 @@ void main_menu_draw(MENU_DATA *pMenuData, OFFLINE_INSTALL_CONFIG *pConfig) // size in case user resized terminal window resize_and_reposition_window_and_subwindow(pMenuData, WIN_NUM_LINES, WIN_WIDTH_COLS); - sprintf(systemInfo, "Target Installer: %s : %s", pConfig->distroName, pConfig->kernelVersion); + wattron(pMenuData->pMenuWindow, COLOR_PAIR(9) | A_UNDERLINE); + mvwprintw(pMenuData->pMenuWindow, ITEM_TITLE_Y, ITEM_TITLE_X, "Target Installer"); + wattroff(pMenuData->pMenuWindow, COLOR_PAIR(9) | A_UNDERLINE); + + sprintf(systemInfo, " OS : %s\n Kernel : %s", pConfig->distroName, pConfig->kernelVersion); print_menu_title(pMenuData, MENU_TITLE_Y, MENU_TITLE_X, WIN_WIDTH_COLS, "ROCm Offline Installer Creator", COLOR_PAIR(2)); - print_menu_item_title(pMenuData, ITEM_TITLE_Y, ITEM_TITLE_X, systemInfo, COLOR_PAIR(9)); + print_menu_item_title(pMenuData, ITEM_TITLE_Y + 1, ITEM_TITLE_X, systemInfo, COLOR_PAIR(9)); print_menu_control_msg(pMenuData); @@ -207,11 +220,11 @@ void update_menu_states(OFFLINE_INSTALL_MENUS *pOfflineMenus) summary_menu_update_state(&pOfflineMenus->menuSummary); } -void write_offline_configuration(OFFLINE_INSTALL_CONFIG *pConfig) +void write_offline_configuration(OFFLINE_INSTALL_CONFIG *pConfig, char *wconfig) { int len; - FILE *file = fopen("create.config", "w"); + FILE *file = fopen(wconfig, "w"); if (file == NULL) { // Print an error message to the console if opening the file fails. @@ -253,7 +266,7 @@ void write_offline_configuration(OFFLINE_INSTALL_CONFIG *pConfig) fprintf(file, "%s\n", "# Extra Package Options"); fprintf(file, "%s\n", "###############################"); - char extra_packages[256]; + char extra_packages[DEFAULT_CHAR_SIZE]; extra_packages[0] = '\0'; // set the extra packages according to the rocm usecase @@ -285,36 +298,58 @@ void write_offline_configuration(OFFLINE_INSTALL_CONFIG *pConfig) fclose(file); } -int create_offline_installer(OFFLINE_INSTALL_CONFIG *pConfig) +int create_offline_installer(OFFLINE_INSTALL_CONFIG *pConfig, char *wconfig) { // Write out all configuration setting to the configuration file - write_offline_configuration(pConfig); + write_offline_configuration(pConfig, wconfig); return 0; } -void parse_args(char* argv[], int argc, char* arglist, int arglist_size) +void parse_args(char* argv[], int argc, int arglist_size, ARGS_INFO *argsInfo) { int len = 0; - // Concatenate args into a single string for (int i = 1; i < argc; i++) { + len += strlen(argv[i]); if (len > arglist_size)break; - strcat(arglist, argv[i]); + strcat(argsInfo->createArgs, argv[i]); if (i < argc - 1) { len++; if (len > arglist_size) break; - strcat(arglist, " "); + strcat(argsInfo->createArgs, " "); + } + + if (strstr(argv[i], "wconfig=") != NULL) + { + if (!get_value_of_wconfig(argv[i], argsInfo->wconfig)) + { + printf("\nIncorrect value passed to wconfig. The correct format is wconfig="); + exit(1); + } + argsInfo->isWconfig = true; + + char *wconfigcopy = strdup(argsInfo->wconfig); + char *wconfigDir = dirname(wconfigcopy); + + if (!is_dir_exist(wconfigDir)) + { + printf("\nPath passed via wconfig '%s' is not valid because directory '%s' does not exist\n", argsInfo->wconfig, wconfigDir); + exit(1); + } + + printf("\nWrite config file only: %s\n", argsInfo->wconfig); } } } int main(int argc, char *argv[]) { + ARGS_INFO argsInfo = {0}; WINDOW *menuWindow; MENU *pMenu; ITEM *pCurrentItem; @@ -326,11 +361,11 @@ int main(int argc, char *argv[]) int done = 0; int status = -1; - char createArgs[200]; - clear_str(createArgs); + // set default value for wconfig + strcpy(argsInfo.wconfig, "create.config"); // parse any args for create script - parse_args(argv,argc, createArgs, 200); + parse_args(argv,argc, DEFAULT_CHAR_SIZE, &argsInfo); // Get distro/kernel info on the host system get_os_info(&offlineConfig); @@ -342,7 +377,7 @@ int main(int argc, char *argv[]) noecho(); keypad(stdscr, TRUE); curs_set(0); - + // init colors init_pair(1, COLOR_RED, COLOR_BLACK); init_pair(2, COLOR_CYAN, COLOR_BLACK); @@ -448,7 +483,7 @@ int main(int argc, char *argv[]) if (offlineMenus.menuSummary.isCreateInstaller) { - status = create_offline_installer(&offlineConfig); + status = create_offline_installer(&offlineConfig, argsInfo.wconfig); done = 1; } } @@ -489,11 +524,28 @@ int main(int argc, char *argv[]) // call the creator script if (status == 0) { - char cmd[256]; + if (argsInfo.isWconfig) + { + return 0; + } + char cmd[LARGE_CHAR_SIZE]; + char createCreatorDir[LARGE_CHAR_SIZE]; clear_str(cmd); - sprintf(cmd, "./create-offline.sh %s", createArgs); + // Only run below 2 commands with sudo if current user isn't a root user + char sudo[SMALL_CHAR_SIZE] = {'\0'}; + if (getuid() != 0) + { + sprintf(sudo, "sudo"); + } + + printf("Create directory: /var/log/offline_creator\n"); + fflush(stdout); + sprintf(createCreatorDir, "%s mkdir -p /var/log/offline_creator", sudo); + system(createCreatorDir); + sprintf(cmd, "./create-offline.sh %s 2>&1 | %s tee %s", argsInfo.createArgs, sudo, offlineConfig.create_confg.installer_creation_log_out_location); system(cmd); + printf("Creation log stored in: %s\n", offlineConfig.create_confg.installer_creation_log_out_location); } return 0; diff --git a/src/offline-installer/UI/src/summary_menu.c b/src/offline-installer/UI/src/summary_menu.c index d03f3af1..c1eeda93 100644 --- a/src/offline-installer/UI/src/summary_menu.c +++ b/src/offline-installer/UI/src/summary_menu.c @@ -21,11 +21,24 @@ * ************************************************************************ */ #include "summary_menu.h" #include "help_menu.h" +#include "create_menu.h" #include #include "utils.h" #include +char *targetSystemInfoOps[] = { + "OS", + "Kernel", + (char *)NULL +}; + +char *targetSystemInfoValues[] = { + "", + "", + (char *)NULL +}; + char *summaryConfigOps[] = { "Installer Input", "Repo Type", @@ -121,8 +134,8 @@ ITEMLIST_PARAMS summaryMenuItems = { .pItemListDesp = summaryMenuDesc }; -char install_name_trim[256]; -char install_loc_trim[256]; +char install_name_trim[DEFAULT_CHAR_SIZE]; +char install_loc_trim[DEFAULT_CHAR_SIZE]; void process_summary_menu(MENU_DATA *pMenuData); void process_summary_item(MENU_DATA *pMenuData); @@ -190,10 +203,12 @@ void destroy_summary_menu_window(MENU_DATA *pMenuData) void summary_menu_draw(MENU_DATA *pMenuData) { + wclear(pMenuData->pMenuWindow); + // Flip order because we want to overwrite the default menu item title name w/ // that menu_draw writes w/ the text "Target: pMenuData->pConfig->distroName" // from draw_summary_page - menu_draw(pMenuData); + menu_draw(pMenuData); draw_summary_page(pMenuData); } @@ -436,15 +451,22 @@ int draw_create_config_summary_page(MENU_DATA *pMenuData) wclear(pMenuData->pMenuSubWindow); - starty = draw_target_option_summary_page(pMenuData); - + // Target Installer + targetSystemInfoValues[0] = pOfflineConfigs->distroName; + targetSystemInfoValues[1] = pOfflineConfigs->kernelVersion; + starty = print_sub_menu_summary_options(pMenuData,pMenuSubWindow,targetSystemInfoOps, "Target Installer", targetSystemInfoValues, COL1_SUMMARY_MENU_OP_STARTX, COLS_SUMMARY_MENU_STARTY, COL2_SUMMARY_MENU_VALUE_STARTX, COL2_SUMMARY_MENU_VALUE_WIDTH); + + // Create Configuration summaryConfigValues[0] = createMenuInstallTypes[pOfflineConfigs->installerType].installer_input; summaryConfigValues[1] = createMenuRepoTypes[pOfflineConfigs->installerRepoType].repo_name; summaryConfigValues[2] = createMenuDLTypes[pOfflineConfigs->create_confg.currentInstallDLType].download_dep_name; summaryConfigValues[3] = pOfflineConfigs->create_confg.installer_name_with_extension; summaryConfigValues[4] = pOfflineConfigs->create_confg.installer_out_location; - + + // Add a line between target installer and create configration info + starty++; + int endy = print_sub_menu_summary_options(pMenuData,pMenuSubWindow,summaryConfigOps, "Create Configuration", summaryConfigValues, COL1_SUMMARY_MENU_OP_STARTX, starty, COL2_SUMMARY_MENU_VALUE_STARTX, COL2_SUMMARY_MENU_VALUE_WIDTH); draw_page_number(pMenuData); @@ -460,6 +482,7 @@ void draw_driver_summary_page(MENU_DATA *pMenuData) wclear(pMenuData->pMenuSubWindow); + // Driver summaryDriverValues[0] = bool_to_yes_no(pOfflineConfigs->driver_config.install_driver); if (pOfflineConfigs->driver_config.install_driver) { @@ -487,6 +510,7 @@ void draw_rocm_and_extras_summary_page(MENU_DATA *pMenuData) wclear(pMenuData->pMenuSubWindow); + // ROCm if (is_repo_public(pMenuData)) { summaryRocmOps[0] = "ROCm Version"; @@ -518,6 +542,7 @@ void draw_rocm_and_extras_summary_page(MENU_DATA *pMenuData) starty += 2; + // Extra summaryExtraValues[0] = bool_to_yes_no(pOfflineConfigs->extras_config.rocminfo_install); summaryExtraValues[1] = bool_to_yes_no(pOfflineConfigs->extras_config.rocmsmi_install); diff --git a/src/offline-installer/UI/src/utils.c b/src/offline-installer/UI/src/utils.c index d90a2086..0be642db 100644 --- a/src/offline-installer/UI/src/utils.c +++ b/src/offline-installer/UI/src/utils.c @@ -20,11 +20,13 @@ * * ************************************************************************ */ #include "utils.h" + #include #include #include #include #include +#include int calculate_text_height(char *desc, int width) { @@ -70,7 +72,7 @@ bool is_field_empty(char *text) int get_field_length(char *text, int field_width) { - char temp[256]; + char temp[DEFAULT_CHAR_SIZE]; int i; strcpy(temp, text); @@ -88,7 +90,7 @@ void field_trim(char *src, char *dst, int max) { int field_len = get_field_length(src, max); - memset(dst, '\0', 256); + memset(dst, '\0', DEFAULT_CHAR_SIZE); strncpy(dst, src, (max-3)); if (field_len > (max -3) ) { @@ -98,7 +100,7 @@ void field_trim(char *src, char *dst, int max) int check_url(char *url) { - char command[256]; + char command[DEFAULT_CHAR_SIZE]; sprintf(command, "wget -q --spider %s", url); @@ -134,9 +136,9 @@ void remove_end_spaces(char *str, int max) { int field_len = get_field_length(str, max); - char temp[256]; + char temp[DEFAULT_CHAR_SIZE]; - memset(temp, '\0', 256); + memset(temp, '\0', DEFAULT_CHAR_SIZE); strncpy(temp, str, field_len); strcpy(str, temp); @@ -152,4 +154,55 @@ int clear_str(char *str) memset(str, '\0', strlen(str)); return 0; +} + +bool is_dir_exist(char *path) +{ + DIR* dir = opendir(path); + if (dir) + { + /* Directory exists. */ + closedir(dir); + return true; + } + else + { + return false; + } + +} + +bool is_rocm_installed() +{ + DIR* dir = opendir("/opt/rocm"); + if (dir) + { + /* Directory exists. */ + closedir(dir); + return true; + } + else + { + return false; + } +} + +bool get_value_of_wconfig(char *src, char *dst) +{ + char *p = strtok (src, "="); + if (p == NULL) + { + return false; + } + else + { + p = strtok(NULL, "="); + if (p == NULL) + { + return false; + } + } + + strncpy(dst, p, strlen(p) + 1); + return true; } \ No newline at end of file diff --git a/src/offline-installer/UI/src/utils.h b/src/offline-installer/UI/src/utils.h index 8c6a1464..5680ead0 100644 --- a/src/offline-installer/UI/src/utils.h +++ b/src/offline-installer/UI/src/utils.h @@ -27,6 +27,11 @@ #define TOGGLE_BIT(val, bitIndx) val ^= (1 << bitIndx) #define TOGGLE_FALSE(val, bitIndx) val &= ~(1 << bitIndx) + +#define DEFAULT_CHAR_SIZE 256 +#define LARGE_CHAR_SIZE 1024 +#define SMALL_CHAR_SIZE 32 + int calculate_text_height(char *desc, int width); int get_char_array_size(char *array[]); bool is_field_empty(char *text); @@ -40,6 +45,10 @@ void remove_slash(char *str); void remove_end_spaces(char *str, int max); int clear_str(char *str); +bool is_rocm_installed(); +bool get_value_of_wconfig(char *src, char *dst); +bool is_dir_exist(char *path); + #endif // _UTILIS_H diff --git a/src/offline-installer/VERSION b/src/offline-installer/VERSION index 3431e444..7f14bba5 100755 --- a/src/offline-installer/VERSION +++ b/src/offline-installer/VERSION @@ -1,2 +1,2 @@ -1.0.0 -6.2 +1.0.2 +6.2.2 diff --git a/src/offline-installer/scripts/deb/create-offline.sh b/src/offline-installer/scripts/deb/create-offline.sh index b7b38bee..9e4de974 100755 --- a/src/offline-installer/scripts/deb/create-offline.sh +++ b/src/offline-installer/scripts/deb/create-offline.sh @@ -304,9 +304,9 @@ cleanup_create() { if [ $? -eq 0 ]; then echo amdgpu-install package is already installed. Cleaning up for new install - $SUDO apt purge -y amdgpu-install + $SUDO apt-get purge -y amdgpu-install - $SUDO apt autoremove -y + $SUDO apt-get autoremove -y $SUDO apt-get update > /dev/null 2>&1 else if [ -f /usr/bin/amdgpu-install ]; then @@ -471,7 +471,7 @@ download_validate_resolve() { $SUDO apt-get clean # simulate/dryrun the install - $SUDO apt install --dry-run $PACKAGES + $SUDO apt-get install --dry-run $PACKAGES if [ $? -eq 0 ]; then print_no_err "Valid package dependencies." else @@ -670,33 +670,32 @@ config_create() { # Check for a URL config file if [[ -n $URL_CONFIG ]]; then - if [[ ! -f $URL_CONFIG ]]; then - print_err "URL configuration file not found." - exit 1 - fi + if [[ -f $URL_CONFIG ]]; then + echo "Using URL Configuration file : $URL_CONFIG" + source $URL_CONFIG - echo "Using URL Configuration file : $URL_CONFIG" - source $URL_CONFIG - - echo Checking URL for $ROCM_VERSIONS - if [[ "$AMDGPU_INSTALL_URL" != *"$ROCM_VERSIONS"* ]]; then - echo ROCm version in URL file does not match. - exit 1 - fi + echo Checking URL for $ROCM_VERSIONS + if [[ "$AMDGPU_INSTALL_URL" != *"$ROCM_VERSIONS"* ]]; then + echo ROCm version in URL file does not match. + exit 1 + fi - if [[ "$ROCM_URL" != *"$ROCM_VERSIONS"* ]]; then - echo ROCm version in URL file does not match. - exit 1 - fi + if [[ "$ROCM_URL" != *"$ROCM_VERSIONS"* ]]; then + echo ROCm version in URL file does not match. + exit 1 + fi - if [[ "$AMDGPU_URL" != *"$ROCM_VERSIONS"* ]]; then - echo ROCm version in URL file does not match. - exit 1 + if [[ "$AMDGPU_URL" != *"$ROCM_VERSIONS"* ]]; then + echo ROCm version in URL file does not match. + exit 1 + fi + + echo "AMDGPU_INSTALL_URL = $AMDGPU_INSTALL_URL" + echo "ROCM_URL = $ROCM_URL" + echo "AMDGPU_URL = $AMDGPU_URL" + else + echo -e "\e[93mWaring: URL configuration file not found. Using defaults.\e[0m" fi - - echo "AMDGPU_INSTALL_URL = $AMDGPU_INSTALL_URL" - echo "ROCM_URL = $ROCM_URL" - echo "AMDGPU_URL = $AMDGPU_URL" fi # Check for the installer package generation type @@ -766,7 +765,7 @@ build_installer() { write_install_config # Create the .run for the installer - makeself $INSTALL_MAKESELF_OPTIONS ./$CREATE_INSTALLER_DIR "./$INSTALL_PACKAGE_NAME" "ROCm Offline Install" ./install.sh + makeself $INSTALL_MAKESELF_OPTIONS --nox11 ./$CREATE_INSTALLER_DIR "./$INSTALL_PACKAGE_NAME" "ROCm Offline Install" ./install.sh cp -Rp "$INSTALL_PACKAGE_NAME" $INSTALL_PACKAGE_DIR echo Building Offline Installer .run...Complete diff --git a/src/offline-installer/scripts/deb/installer-package/install.sh b/src/offline-installer/scripts/deb/installer-package/install.sh index 6cc331bd..b029083c 100755 --- a/src/offline-installer/scripts/deb/installer-package/install.sh +++ b/src/offline-installer/scripts/deb/installer-package/install.sh @@ -22,6 +22,12 @@ # THE SOFTWARE. # ############################################################################# +# Logs +RUN_INSTALLER_LOGS=/var/log/offline_creator +RUN_INSTALLER_CURRENT_LOG="$RUN_INSTALLER_LOGS/install_$(date +%s).log" + +{ + # Debug Settings DEBUG_INSTALL=no DEBUG_CONFIG=no @@ -683,3 +689,7 @@ fi echo Cleaning up...Complete +} 2>&1 | $SUDO tee $RUN_INSTALLER_CURRENT_LOG + +echo "Install log stored in: $RUN_INSTALLER_CURRENT_LOG" + diff --git a/src/offline-installer/scripts/el/create-offline.sh b/src/offline-installer/scripts/el/create-offline.sh index 359eeee6..f6598da2 100755 --- a/src/offline-installer/scripts/el/create-offline.sh +++ b/src/offline-installer/scripts/el/create-offline.sh @@ -263,7 +263,7 @@ setup_installer_public_repos() { $SUDO chmod 644 ./$AMDGPU_INSTALL_NAME - $SUDO dnf download --downloadonly --resolve --downloaddir="./$CREATE_INSTALLER_PACKAGE_DIR" install ./$AMDGPU_INSTALL_NAME + $SUDO dnf download --downloadonly --resolve --downloaddir="./$CREATE_INSTALLER_PACKAGE_DIR" ./$AMDGPU_INSTALL_NAME # Install amdgpu-install for host installer creation $SUDO dnf clean all @@ -715,44 +715,43 @@ config_create() { # Check for a URL config file if [[ -n $URL_CONFIG ]]; then - if [[ ! -f $URL_CONFIG ]]; then - print_err "URL configuration file not found." - exit 1 - fi - - echo "Using URL Configuration file : $URL_CONFIG" - source $URL_CONFIG - - echo Checking URL for $DISTRO_VER - if [[ "$AMDGPU_INSTALL_URL" != *"$DISTRO_VER"* ]]; then - echo amdgpu-install distro version in URL file does not match. - exit 1 - fi + if [[ -f $URL_CONFIG ]]; then + echo "Using URL Configuration file : $URL_CONFIG" + source $URL_CONFIG + + echo Checking URL for $DISTRO_VER + if [[ "$AMDGPU_INSTALL_URL" != *"$DISTRO_VER"* ]]; then + echo amdgpu-install distro version in URL file does not match. + exit 1 + fi - if [[ "$AMDGPU_URL" != *"$DISTRO_VER"* ]]; then - echo amdgpu distro version in URL file does not match. - exit 1 - fi + if [[ "$AMDGPU_URL" != *"$DISTRO_VER"* ]]; then + echo amdgpu distro version in URL file does not match. + exit 1 + fi - echo Checking URL for $ROCM_VERSIONS - if [[ "$AMDGPU_INSTALL_URL" != *"$ROCM_VERSIONS"* ]]; then - echo ROCm version in URL file does not match. - exit 1 - fi + echo Checking URL for $ROCM_VERSIONS + if [[ "$AMDGPU_INSTALL_URL" != *"$ROCM_VERSIONS"* ]]; then + echo ROCm version in URL file does not match. + exit 1 + fi - if [[ "$ROCM_URL" != *"$ROCM_VERSIONS"* ]]; then - echo ROCm version in URL file does not match. - exit 1 - fi + if [[ "$ROCM_URL" != *"$ROCM_VERSIONS"* ]]; then + echo ROCm version in URL file does not match. + exit 1 + fi - if [[ "$AMDGPU_URL" != *"$ROCM_VERSIONS"* ]]; then - echo ROCm version in URL file does not match. - exit 1 + if [[ "$AMDGPU_URL" != *"$ROCM_VERSIONS"* ]]; then + echo ROCm version in URL file does not match. + exit 1 + fi + + echo "AMDGPU_INSTALL_URL = $AMDGPU_INSTALL_URL" + echo "ROCM_URL = $ROCM_URL" + echo "AMDGPU_URL = $AMDGPU_URL" + else + echo -e "\e[93mWaring: URL configuration file not found. Using defaults.\e[0m" fi - - echo "AMDGPU_INSTALL_URL = $AMDGPU_INSTALL_URL" - echo "ROCM_URL = $ROCM_URL" - echo "AMDGPU_URL = $AMDGPU_URL" fi # Check for the installer package generation type @@ -827,7 +826,7 @@ build_installer() { write_install_config # Create the .run for the installer - makeself $INSTALL_MAKESELF_OPTIONS ./$CREATE_INSTALLER_DIR "./$INSTALL_PACKAGE_NAME" "ROCm Offline Install" ./install.sh + makeself $INSTALL_MAKESELF_OPTIONS --nox11 ./$CREATE_INSTALLER_DIR "./$INSTALL_PACKAGE_NAME" "ROCm Offline Install" ./install.sh cp -Rp "$INSTALL_PACKAGE_NAME" $INSTALL_PACKAGE_DIR echo Building Offline Installer .run...Complete diff --git a/src/offline-installer/scripts/el/installer-package/install.sh b/src/offline-installer/scripts/el/installer-package/install.sh index e2cd4db3..d86222b4 100755 --- a/src/offline-installer/scripts/el/installer-package/install.sh +++ b/src/offline-installer/scripts/el/installer-package/install.sh @@ -22,6 +22,12 @@ # THE SOFTWARE. # ############################################################################# +# Logs +RUN_INSTALLER_LOGS=/var/log/offline_creator +RUN_INSTALLER_CURRENT_LOG="$RUN_INSTALLER_LOGS/install_$(date +%s).log" + +{ + # Debug Settings DEBUG_INSTALL=no DEBUG_CONFIG=no @@ -262,8 +268,9 @@ config_install() { } +# User must pass in the exit_status as a parameter when calling this function install_check() { - local exit_status=$? + local exit_status=$1 if [[ $exit_status -ne 0 ]] && [[ $INSTALLER_DRYRUN == 0 ]]; then print_err "Packages failed to install. exit_status $exit_status" @@ -284,10 +291,12 @@ install_rocm_full() { # install the kernel packages echo Install kernel packages... $KERNEL_PACKAGES $SUDO dnf --nogpg $INSTALLER_OPTS --disablerepo=* --enablerepo=repo-offline --allowerasing install $KERNEL_PACKAGES + local exit_status=$? if [[ $INSTALLER_DRYRUN == 1 ]]; then errorCheck=$($SUDO dnf --nogpg $INSTALLER_OPTS --disablerepo=* --enablerepo=repo-offline --allowerasing install $KERNEL_PACKAGES) fi - install_check + + install_check "$exit_status" echo Install kernel packages...Complete # install the rocm packages (if required) @@ -295,10 +304,11 @@ install_rocm_full() { echo Install ROCm packages... $ROCM_USECASES_PACKAGES $SUDO dnf --nogpg $INSTALLER_OPTS --disablerepo=* --enablerepo=repo-offline --allowerasing install $ROCM_USECASES_PACKAGES + local exit_status=$? if [[ $INSTALLER_DRYRUN == 1 ]]; then errorCheck=$($SUDO dnf --nogpg $INSTALLER_OPTS --disablerepo=* --enablerepo=repo-offline --allowerasing install $ROCM_USECASES_PACKAGES) fi - install_check + install_check "$exit_status" echo Install ROCm packages...Complete fi @@ -308,10 +318,11 @@ install_rocm_full() { echo Install amdgpu packages... $AMDGPU_PACKAGES $AMDGPU_KERNEL_PACKAGES $SUDO dnf --nogpg $INSTALLER_OPTS --disablerepo=* --enablerepo=repo-offline --allowerasing install $AMDGPU_PACKAGES $AMDGPU_KERNEL_PACKAGES + local exit_status=$? if [[ $INSTALLER_DRYRUN == 1 ]]; then errorCheck=$($SUDO dnf --nogpg $INSTALLER_OPTS --disablerepo=* --enablerepo=repo-offline --allowerasing install $AMDGPU_PACKAGES $AMDGPU_KERNEL_PACKAGES) fi - install_check + install_check "$exit_status" echo Install amdgpu packages...Complete fi @@ -322,10 +333,11 @@ install_rocm_min() { echo Install packages... $KERNEL_PACKAGES $ROCM_USECASES_PACKAGES $AMDGPU_PACKAGES $AMDGPU_KERNEL_PACKAGES $SUDO dnf --nogpg $INSTALLER_OPTS --disablerepo=* --enablerepo=repo-offline --allowerasing install $KERNEL_PACKAGES $ROCM_USECASES_PACKAGES $AMDGPU_PACKAGES $AMDGPU_KERNEL_PACKAGES + local exit_status=$? if [[ $INSTALLER_DRYRUN == 1 ]]; then errorCheck=$($SUDO dnf --nogpg $INSTALLER_OPTS --disablerepo=* --enablerepo=repo-offline --allowerasing install $KERNEL_PACKAGES $ROCM_USECASES_PACKAGES $AMDGPU_PACKAGES $AMDGPU_KERNEL_PACKAGES) fi - install_check + install_check "$exit_status" echo Install packages...Complete } @@ -682,3 +694,7 @@ fi echo Cleaning up...Complete +} 2>&1 | $SUDO tee $RUN_INSTALLER_CURRENT_LOG + +echo "Install log stored in: $RUN_INSTALLER_CURRENT_LOG" + diff --git a/src/offline-installer/scripts/el/installer-package/repo-offline.repo b/src/offline-installer/scripts/el/installer-package/repo-offline.repo index d9dd920b..18dca0f2 100644 --- a/src/offline-installer/scripts/el/installer-package/repo-offline.repo +++ b/src/offline-installer/scripts/el/installer-package/repo-offline.repo @@ -2,3 +2,4 @@ name=ROCm-amdgpu offline repository baseurl=file:///tmp/offline-repo enabled=0 +module_hotfixes=true diff --git a/src/offline-installer/scripts/offline_init.sh b/src/offline-installer/scripts/offline_init.sh index d1c9e23d..5531b465 100755 --- a/src/offline-installer/scripts/offline_init.sh +++ b/src/offline-installer/scripts/offline_init.sh @@ -35,35 +35,88 @@ Usage: $PROG [options] version = Displays the ROCm Offline Creater Tool version. prompt = Run the creator with user prompts. config= = Full path to a .config file with create settings in the format of create-default.config. - + wconfig= = Will only create a .config file in with create settings chosen by user in the GUI and exit without creating an installer package. ie. ./rocm-offline-creator_1.0.0-local.run ./rocm-offline-creator_1.0.0-local.run version ./rocm-offline-creator_1.0.0-local.run prompt ./rocm-offline-creator_1.0.0-local.run config=/home/user/create.config prompt + ./rocm-offline-creator_1.0.0-local.run wconfig=/home/user/created.config END_USAGE } -print_version() { +get_version() { i=0 while IFS= read -r line; do case $i in - 0) VERSION="$line" ;; + 0) CREATOR_VERSION="$line" ;; 1) ROCM_VERSION="$line" ;; 2) PACKAGE="$line" ;; esac i=$((i+1)) done < "./VERSION" - - echo ROCm Offline Creator Version : $VERSION-$ROCM_VERSION +} + +print_version() { + echo ROCm Offline Creator Version : $CREATOR_VERSION-$ROCM_VERSION echo ROCm Offline Creator Package : $PACKAGE } +os_release() { + get_version + + if [[ -r /etc/os-release ]]; then + . /etc/os-release + + DISTRO_NAME=$ID + DISTRO_VER=$(awk -F= '/^VERSION_ID=/{print $2}' /etc/os-release | tr -d '"') + + case "$ID" in + ubuntu) + PACKAGE_VER=${PACKAGE##*~} + PACKAGE_VER=${PACKAGE_VER%.run} + ;; + rhel) + PACKAGE_VER=${PACKAGE##*el} + PACKAGE_VER=${PACKAGE_VER%%.*} + + DISTRO_VER=${DISTRO_VER%%.*} + ;; + sles) + PACKAGE_VER=${PACKAGE##*sles} + PACKAGE_VER=${PACKAGE_VER%%.*} + + DISTRO_VER=${DISTRO_VER/./} + ;; + *) + echo "$ID is Unsupported OS" + exit 1 + ;; + esac + else + echo "Unsupported OS" + exit 1 + fi + + # For non-local builds, verify package version matches for the running host distribution + if [[ $PACKAGE != *"local"* ]]; then + if [ $PACKAGE_VER != $DISTRO_VER ]; then + echo -e "\e[31m++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\e[0m" + echo -e "\e[31mError: ROCm Offline Creator Package mismatch:\e[0m" + echo -e "\e[31m ${DISTRO_NAME} ${DISTRO_VER} != ${DISTRO_NAME} ${PACKAGE_VER} (Package)\e[0m" + echo -e "\e[31m++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\e[0m" + exit 1 + fi + fi +} + ####### Main script ############################################################### PROG=${0##*/} +os_release + # parse args while (($#)) do @@ -92,7 +145,7 @@ if [ -n "$CONFIG_FILE_PATH" ]; then echo Using create script. ./create-offline.sh config=$CONFIG_FILE_PATH $ARGS else - echo Using UI. + echo Using UI with args: $ARGS ./rocm_offline_ui $ARGS fi diff --git a/src/offline-installer/scripts/sle/cleanup-create.sh b/src/offline-installer/scripts/sle/cleanup-create.sh index e471b079..a6a1dbf2 100755 --- a/src/offline-installer/scripts/sle/cleanup-create.sh +++ b/src/offline-installer/scripts/sle/cleanup-create.sh @@ -22,7 +22,7 @@ # THE SOFTWARE. # ############################################################################# -CREATE_CLEAN_ZYP_REPOS_AMD=(repo-tar-offline.repo repo-offline.repo amdgpu.repo amdgpu-proprietary.repo amdgpu-build.repo amdgpu-local.repo amdgpu.repo.rpmsave rocm-build.repo rocm.repo rocm.repo.rpmsave oss.repo) +CREATE_CLEAN_ZYP_REPOS_AMD=(repo-tar-offline.repo repo-offline.repo amdgpu.repo amdgpu-proprietary.repo amdgpu-build.repo amdgpu-local.repo amdgpu.repo.rpmsave rocm-build.repo rocm.repo rocm.repo.rpmsave Education.repo) CLEAN_REPO=0 diff --git a/src/offline-installer/scripts/sle/create-offline.sh b/src/offline-installer/scripts/sle/create-offline.sh index 431a72ca..cf113565 100755 --- a/src/offline-installer/scripts/sle/create-offline.sh +++ b/src/offline-installer/scripts/sle/create-offline.sh @@ -76,7 +76,7 @@ VALIDATE_DOWNLOAD=yes PROMPT_USER=0 # Cleanup repos -CREATE_CLEAN_ZYP_REPOS_AMD=(repo-tar-offline.repo repo-offline.repo amdgpu.repo amdgpu-proprietary.repo amdgpu-build.repo amdgpu-local.repo amdgpu.repo.rpmsave rocm-build.repo rocm.repo rocm.repo.rpmsave oss.repo) +CREATE_CLEAN_ZYP_REPOS_AMD=(repo-tar-offline.repo repo-offline.repo amdgpu.repo amdgpu-proprietary.repo amdgpu-build.repo amdgpu-local.repo amdgpu.repo.rpmsave rocm-build.repo rocm.repo rocm.repo.rpmsave Education.repo) ###### Functions ############################################################### @@ -191,23 +191,23 @@ os_release() { echo " ${KERNEL_VER}" } -setup_oss_repo() { - # Create a .repo file for the OSS repo - echo Setting up OSS repo.. +setup_edu_repo() { + # Create a .repo file for the Education repo + echo Setting up Education repo.. if [[ $DISTRO_VER == 15.4 ]]; then - $SUDO zypper addrepo http://download.opensuse.org/distribution/leap/15.4/repo/oss/ oss + $SUDO zypper addrepo http://download.opensuse.org/repositories/Education/15.4/ Education elif [[ $DISTRO_VER == 15.5 ]]; then - $SUDO zypper addrepo http://download.opensuse.org/distribution/leap/15.5/repo/oss/ oss + $SUDO zypper addrepo http://download.opensuse.org/repositories/Education/15.5/ Education elif [[ $DISTRO_VER == 15.6 ]]; then - $SUDO zypper addrepo http://download.opensuse.org/distribution/leap/15.6/repo/oss/ oss + $SUDO zypper addrepo http://download.opensuse.org/repositories/Education/15.6/ Education else - echo "Unsupported version for OSS." + echo "Unsupported version for Education." fi $SUDO zypper --gpg-auto-import-keys ref - echo Setting up OSS repo..Complete + echo Setting up Education repo..Complete } install_prereqs() { @@ -232,13 +232,13 @@ install_prereqs() { echo "Perl language repo already added." fi - # Add the oss repo if ROCm 6.2+ + # Add the Education repo if ROCm 6.2+ if [[ "${ROCM_VERSIONS:0:1}" -eq 6 ]] && [[ "${ROCM_VERSIONS:2:1}" -ge 2 ]]; then - setup_oss_repo + setup_edu_repo elif [[ "${ROCM_VERSIONS:0:1}" -ge 7 ]]; then - setup_oss_repo + setup_edu_repo else - OSS Repo not required. + Education Repo not required. fi } @@ -697,44 +697,43 @@ config_create() { # Check for a URL config file if [[ -n $URL_CONFIG ]]; then - if [[ ! -f $URL_CONFIG ]]; then - print_err "URL configuration file not found." - exit 1 - fi - - echo "Using URL Configuration file : $URL_CONFIG" - source $URL_CONFIG + if [[ -f $URL_CONFIG ]]; then + echo "Using URL Configuration file : $URL_CONFIG" + source $URL_CONFIG - echo Checking URL for $DISTRO_VER - if [[ "$AMDGPU_INSTALL_URL" != *"$DISTRO_VER"* ]]; then - echo amdgpu-install distro version in URL file does not match. - exit 1 - fi + echo Checking URL for $DISTRO_VER + if [[ "$AMDGPU_INSTALL_URL" != *"$DISTRO_VER"* ]]; then + echo amdgpu-install distro version in URL file does not match. + exit 1 + fi - if [[ "$AMDGPU_URL" != *"$DISTRO_VER"* ]]; then - echo amdgpu distro version in URL file does not match. - exit 1 - fi + if [[ "$AMDGPU_URL" != *"$DISTRO_VER"* ]]; then + echo amdgpu distro version in URL file does not match. + exit 1 + fi - echo Checking URL for $ROCM_VERSIONS - if [[ "$AMDGPU_INSTALL_URL" != *"$ROCM_VERSIONS"* ]]; then - echo ROCm version in URL file does not match. - exit 1 - fi + echo Checking URL for $ROCM_VERSIONS + if [[ "$AMDGPU_INSTALL_URL" != *"$ROCM_VERSIONS"* ]]; then + echo ROCm version in URL file does not match. + exit 1 + fi - if [[ "$ROCM_URL" != *"$ROCM_VERSIONS"* ]]; then - echo ROCm version in URL file does not match. - exit 1 - fi + if [[ "$ROCM_URL" != *"$ROCM_VERSIONS"* ]]; then + echo ROCm version in URL file does not match. + exit 1 + fi - if [[ "$AMDGPU_URL" != *"$ROCM_VERSIONS"* ]]; then - echo ROCm version in URL file does not match. - exit 1 + if [[ "$AMDGPU_URL" != *"$ROCM_VERSIONS"* ]]; then + echo ROCm version in URL file does not match. + exit 1 + fi + + echo "AMDGPU_INSTALL_URL = $AMDGPU_INSTALL_URL" + echo "ROCM_URL = $ROCM_URL" + echo "AMDGPU_URL = $AMDGPU_URL" + else + echo -e "\e[93mWaring: URL configuration file not found. Using defaults.\e[0m" fi - - echo "AMDGPU_INSTALL_URL = $AMDGPU_INSTALL_URL" - echo "ROCM_URL = $ROCM_URL" - echo "AMDGPU_URL = $AMDGPU_URL" fi # Check for the installer package generation type @@ -804,7 +803,7 @@ build_installer() { write_install_config # Create the .run for the installer - makeself $INSTALL_MAKESELF_OPTIONS ./$CREATE_INSTALLER_DIR "./$INSTALL_PACKAGE_NAME" "ROCm Offline Install" ./install.sh + makeself $INSTALL_MAKESELF_OPTIONS --nox11 ./$CREATE_INSTALLER_DIR "./$INSTALL_PACKAGE_NAME" "ROCm Offline Install" ./install.sh cp -Rp "$INSTALL_PACKAGE_NAME" $INSTALL_PACKAGE_DIR echo Building Offline Installer .run...Complete diff --git a/src/offline-installer/scripts/sle/installer-package/install.sh b/src/offline-installer/scripts/sle/installer-package/install.sh index 4eb2926d..04c67af0 100755 --- a/src/offline-installer/scripts/sle/installer-package/install.sh +++ b/src/offline-installer/scripts/sle/installer-package/install.sh @@ -22,6 +22,12 @@ # THE SOFTWARE. # ############################################################################# +# Logs +RUN_INSTALLER_LOGS=/var/log/offline_creator +RUN_INSTALLER_CURRENT_LOG="$RUN_INSTALLER_LOGS/install_$(date +%s).log" + +{ + # Debug Settings DEBUG_INSTALL=no DEBUG_CONFIG=no @@ -617,3 +623,7 @@ fi echo Cleaning up...Complete +} 2>&1 | $SUDO tee $RUN_INSTALLER_CURRENT_LOG + +echo "Install log stored in: $RUN_INSTALLER_CURRENT_LOG" + diff --git a/src/offline-installer/tests/CMakeLists.txt b/src/offline-installer/tests/CMakeLists.txt index 19409c9e..114d7978 100755 --- a/src/offline-installer/tests/CMakeLists.txt +++ b/src/offline-installer/tests/CMakeLists.txt @@ -36,18 +36,35 @@ message(STATUS "TEST: URL_CONFIG = " ${URL_CONFIG}) # Usage: # CI test = ctest -L ci -# ROCm Version test = ctest -L ie. 6.1, 6.0.2, 5.7.3 +# ROCm Version test = ctest -L ie. 6.2.x, 6.1.x, 6.0.2, 5.7.3 # Full test = ctest ############ rocm only ############ + +# 6.2.2 +add_test(NAME rocm-only-6.2.2 + COMMAND ${CMAKE_BINARY_DIR}/${PACKAGE_NAME}.run config=${CMAKE_SOURCE_DIR}/tests/create-test-rocm-only-6.2.2.config url=${URL_CONFIG}) +set_tests_properties(rocm-only-6.2.2 PROPERTIES DISABLED ${IS_ROCM_622_DISABLED} TIMEOUT ${TIMEOUT_VALUE} FAIL_REGULAR_EXPRESSION "amdgpu-dkms" LABELS "6.2.2") + +add_test(NAME rocm-only-6.2.2-install-dryrun COMMAND ${INSTALLER_TEST_PATH}/${INSTALLER_TEST_NAME} dryrun) +set_tests_properties(rocm-only-6.2.2-install-dryrun PROPERTIES DISABLED ${IS_ROCM_622_DISABLED} TIMEOUT ${TIMEOUT_VALUE} LABELS "6.2.2") + +# 6.2.1 +add_test(NAME rocm-only-6.2.1 + COMMAND ${CMAKE_BINARY_DIR}/${PACKAGE_NAME}.run config=${CMAKE_SOURCE_DIR}/tests/create-test-rocm-only-6.2.1.config) +set_tests_properties(rocm-only-6.2.1 PROPERTIES DISABLED ${IS_ROCM_621_DISABLED} TIMEOUT ${TIMEOUT_VALUE} FAIL_REGULAR_EXPRESSION "amdgpu-dkms" LABELS "6.2.1") + +add_test(NAME rocm-only-6.2.1-install-dryrun COMMAND ${INSTALLER_TEST_PATH}/${INSTALLER_TEST_NAME} dryrun) +set_tests_properties(rocm-only-6.2.1-install-dryrun PROPERTIES DISABLED ${IS_ROCM_621_DISABLED} TIMEOUT ${TIMEOUT_VALUE} LABELS "6.2.1") + # 6.2 add_test(NAME rocm-only-6.2 - COMMAND ${CMAKE_BINARY_DIR}/${PACKAGE_NAME}.run config=${CMAKE_SOURCE_DIR}/tests/create-test-rocm-only-6.2.config url=${URL_CONFIG}) -set_tests_properties(rocm-only-6.2 PROPERTIES DISABLED ${IS_ROCM_62_DISABLED} TIMEOUT ${TIMEOUT_VALUE} FAIL_REGULAR_EXPRESSION "amdgpu-dkms" LABELS "6.2") + COMMAND ${CMAKE_BINARY_DIR}/${PACKAGE_NAME}.run config=${CMAKE_SOURCE_DIR}/tests/create-test-rocm-only-6.2.config) +set_tests_properties(rocm-only-6.2 PROPERTIES DISABLED ${IS_ROCM_62_DISABLED} TIMEOUT ${TIMEOUT_VALUE} FAIL_REGULAR_EXPRESSION "amdgpu-dkms" LABELS "6.2.0") add_test(NAME rocm-only-6.2-install-dryrun COMMAND ${INSTALLER_TEST_PATH}/${INSTALLER_TEST_NAME} dryrun) -set_tests_properties(rocm-only-6.2-install-dryrun PROPERTIES DISABLED ${IS_ROCM_62_DISABLED} TIMEOUT ${TIMEOUT_VALUE} LABELS "6.2") +set_tests_properties(rocm-only-6.2-install-dryrun PROPERTIES DISABLED ${IS_ROCM_62_DISABLED} TIMEOUT ${TIMEOUT_VALUE} LABELS "6.2.0") # 6.1.3 add_test(NAME rocm-only-6.1.3 @@ -76,10 +93,10 @@ set_tests_properties(rocm-only-6.1.1-install-dryrun PROPERTIES DISABLED ${IS_ROC # 6.1 add_test(NAME rocm-only-6.1 COMMAND ${CMAKE_BINARY_DIR}/${PACKAGE_NAME}.run config=${CMAKE_SOURCE_DIR}/tests/create-test-rocm-only-6.1.config) -set_tests_properties(rocm-only-6.1 PROPERTIES DISABLED ${IS_ROCM_61_DISABLED} TIMEOUT ${TIMEOUT_VALUE} FAIL_REGULAR_EXPRESSION "amdgpu-dkms" LABELS "6.1") +set_tests_properties(rocm-only-6.1 PROPERTIES DISABLED ${IS_ROCM_61_DISABLED} TIMEOUT ${TIMEOUT_VALUE} FAIL_REGULAR_EXPRESSION "amdgpu-dkms" LABELS "6.1.0") add_test(NAME rocm-only-6.1-install-dryrun COMMAND ${INSTALLER_TEST_PATH}/${INSTALLER_TEST_NAME} dryrun) -set_tests_properties(rocm-only-6.1-install-dryrun PROPERTIES DISABLED ${IS_ROCM_61_DISABLED} TIMEOUT ${TIMEOUT_VALUE} LABELS "6.1") +set_tests_properties(rocm-only-6.1-install-dryrun PROPERTIES DISABLED ${IS_ROCM_61_DISABLED} TIMEOUT ${TIMEOUT_VALUE} LABELS "6.1.0") # 6.0.2 add_test(NAME rocm-only-6.0.2 @@ -99,13 +116,29 @@ set_tests_properties(rocm-only-5.7.3-install-dryrun PROPERTIES DISABLED ${IS_ROC ############ driver only ############ +# 6.2.2 +add_test(NAME driver-only-6.2.2 + COMMAND ${CMAKE_BINARY_DIR}/${PACKAGE_NAME}.run config=${CMAKE_SOURCE_DIR}/tests/create-test-driver-only-6.2.2.config url=${URL_CONFIG}) +set_tests_properties(driver-only-6.2.2 PROPERTIES DISABLED ${IS_ROCM_622_DISABLED} TIMEOUT ${TIMEOUT_VALUE} LABELS "6.2.2") + +add_test(NAME driver-only-6.2.2-install-dryrun COMMAND ${INSTALLER_TEST_PATH}/${INSTALLER_TEST_NAME} dryrun) +set_tests_properties(driver-only-6.2.2-install-dryrun PROPERTIES DISABLED ${IS_ROCM_622_DISABLED} TIMEOUT ${TIMEOUT_VALUE} LABELS "6.2.2") + +# 6.2.1 +add_test(NAME driver-only-6.2.1 + COMMAND ${CMAKE_BINARY_DIR}/${PACKAGE_NAME}.run config=${CMAKE_SOURCE_DIR}/tests/create-test-driver-only-6.2.1.config) +set_tests_properties(driver-only-6.2.1 PROPERTIES DISABLED ${IS_ROCM_621_DISABLED} TIMEOUT ${TIMEOUT_VALUE} LABELS "6.2.1") + +add_test(NAME driver-only-6.2.1-install-dryrun COMMAND ${INSTALLER_TEST_PATH}/${INSTALLER_TEST_NAME} dryrun) +set_tests_properties(driver-only-6.2.1-install-dryrun PROPERTIES DISABLED ${IS_ROCM_621_DISABLED} TIMEOUT ${TIMEOUT_VALUE} LABELS "6.2.1") + # 6.2 add_test(NAME driver-only-6.2 - COMMAND ${CMAKE_BINARY_DIR}/${PACKAGE_NAME}.run config=${CMAKE_SOURCE_DIR}/tests/create-test-driver-only-6.2.config url=${URL_CONFIG}) -set_tests_properties(driver-only-6.2 PROPERTIES DISABLED ${IS_ROCM_62_DISABLED} TIMEOUT ${TIMEOUT_VALUE} LABELS "6.2") + COMMAND ${CMAKE_BINARY_DIR}/${PACKAGE_NAME}.run config=${CMAKE_SOURCE_DIR}/tests/create-test-driver-only-6.2.config) +set_tests_properties(driver-only-6.2 PROPERTIES DISABLED ${IS_ROCM_62_DISABLED} TIMEOUT ${TIMEOUT_VALUE} LABELS "6.2.0") add_test(NAME driver-only-6.2-install-dryrun COMMAND ${INSTALLER_TEST_PATH}/${INSTALLER_TEST_NAME} dryrun) -set_tests_properties(driver-only-6.2-install-dryrun PROPERTIES DISABLED ${IS_ROCM_62_DISABLED} TIMEOUT ${TIMEOUT_VALUE} LABELS "6.2") +set_tests_properties(driver-only-6.2-install-dryrun PROPERTIES DISABLED ${IS_ROCM_62_DISABLED} TIMEOUT ${TIMEOUT_VALUE} LABELS "6.2.0") # 6.1.3 add_test(NAME driver-only-6.1.3 @@ -134,10 +167,10 @@ set_tests_properties(driver-only-6.1.1-install-dryrun PROPERTIES DISABLED ${IS_R # 6.1 add_test(NAME driver-only-6.1 COMMAND ${CMAKE_BINARY_DIR}/${PACKAGE_NAME}.run config=${CMAKE_SOURCE_DIR}/tests/create-test-driver-only-6.1.config) -set_tests_properties(driver-only-6.1 PROPERTIES DISABLED ${IS_ROCM_61_DISABLED} TIMEOUT ${TIMEOUT_VALUE} LABELS "6.1") +set_tests_properties(driver-only-6.1 PROPERTIES DISABLED ${IS_ROCM_61_DISABLED} TIMEOUT ${TIMEOUT_VALUE} LABELS "6.1.0") add_test(NAME driver-only-6.1-install-dryrun COMMAND ${INSTALLER_TEST_PATH}/${INSTALLER_TEST_NAME} dryrun) -set_tests_properties(driver-only-6.1-install-dryrun PROPERTIES DISABLED ${IS_ROCM_61_DISABLED} TIMEOUT ${TIMEOUT_VALUE} LABELS "6.1") +set_tests_properties(driver-only-6.1-install-dryrun PROPERTIES DISABLED ${IS_ROCM_61_DISABLED} TIMEOUT ${TIMEOUT_VALUE} LABELS "6.1.0") # 6.0.2 add_test(NAME driver-only-6.0.2 @@ -157,13 +190,29 @@ set_tests_properties(driver-only-5.7.3-install-dryrun PROPERTIES DISABLED ${IS_R ############ rocm + driver ############ +# 6.2.2 +add_test(NAME rocm-driver-6.2.2 + COMMAND ${CMAKE_BINARY_DIR}/${PACKAGE_NAME}.run config=${CMAKE_SOURCE_DIR}/tests/create-test-rocm-driver-6.2.2.config url=${URL_CONFIG}) +set_tests_properties(rocm-driver-6.2.2 PROPERTIES DISABLED ${IS_ROCM_622_DISABLED} TIMEOUT ${TIMEOUT_VALUE} LABELS "ci;6.2.2") + +add_test(NAME rocm-driver-6.2.2-install-dryrun COMMAND ${INSTALLER_TEST_PATH}/${INSTALLER_TEST_NAME} dryrun) +set_tests_properties(rocm-driver-6.2.2-install-dryrun PROPERTIES DISABLED ${IS_ROCM_622_DISABLED} TIMEOUT ${TIMEOUT_VALUE} LABELS "ci;6.2.2") + +# 6.2.1 +add_test(NAME rocm-driver-6.2.1 + COMMAND ${CMAKE_BINARY_DIR}/${PACKAGE_NAME}.run config=${CMAKE_SOURCE_DIR}/tests/create-test-rocm-driver-6.2.1.config) +set_tests_properties(rocm-driver-6.2.1 PROPERTIES DISABLED ${IS_ROCM_621_DISABLED} TIMEOUT ${TIMEOUT_VALUE} LABELS "ci;6.2.1") + +add_test(NAME rocm-driver-6.2.1-install-dryrun COMMAND ${INSTALLER_TEST_PATH}/${INSTALLER_TEST_NAME} dryrun) +set_tests_properties(rocm-driver-6.2.1-install-dryrun PROPERTIES DISABLED ${IS_ROCM_621_DISABLED} TIMEOUT ${TIMEOUT_VALUE} LABELS "ci;6.2.1") + # 6.2 add_test(NAME rocm-driver-6.2 - COMMAND ${CMAKE_BINARY_DIR}/${PACKAGE_NAME}.run config=${CMAKE_SOURCE_DIR}/tests/create-test-rocm-driver-6.2.config url=${URL_CONFIG}) -set_tests_properties(rocm-driver-6.2 PROPERTIES DISABLED ${IS_ROCM_62_DISABLED} TIMEOUT ${TIMEOUT_VALUE} LABELS "ci;6.2") + COMMAND ${CMAKE_BINARY_DIR}/${PACKAGE_NAME}.run config=${CMAKE_SOURCE_DIR}/tests/create-test-rocm-driver-6.2.config) +set_tests_properties(rocm-driver-6.2 PROPERTIES DISABLED ${IS_ROCM_62_DISABLED} TIMEOUT ${TIMEOUT_VALUE} LABELS "ci;6.2.0") add_test(NAME rocm-driver-6.2-install-dryrun COMMAND ${INSTALLER_TEST_PATH}/${INSTALLER_TEST_NAME} dryrun) -set_tests_properties(rocm-driver-6.2-install-dryrun PROPERTIES DISABLED ${IS_ROCM_62_DISABLED} TIMEOUT ${TIMEOUT_VALUE} LABELS "ci;6.2") +set_tests_properties(rocm-driver-6.2-install-dryrun PROPERTIES DISABLED ${IS_ROCM_62_DISABLED} TIMEOUT ${TIMEOUT_VALUE} LABELS "ci;6.2.0") # 6.1.3 add_test(NAME rocm-driver-6.1.3 @@ -192,10 +241,10 @@ set_tests_properties(rocm-driver-6.1.1-install-dryrun PROPERTIES DISABLED ${IS_R # 6.1 add_test(NAME rocm-driver-6.1 COMMAND ${CMAKE_BINARY_DIR}/${PACKAGE_NAME}.run config=${CMAKE_SOURCE_DIR}/tests/create-test-rocm-driver-6.1.config) -set_tests_properties(rocm-driver-6.1 PROPERTIES DISABLED ${IS_ROCM_61_DISABLED} TIMEOUT ${TIMEOUT_VALUE} LABELS "ci;6.1") +set_tests_properties(rocm-driver-6.1 PROPERTIES DISABLED ${IS_ROCM_61_DISABLED} TIMEOUT ${TIMEOUT_VALUE} LABELS "ci;6.1.0") add_test(NAME rocm-driver-6.1-install-dryrun COMMAND ${INSTALLER_TEST_PATH}/${INSTALLER_TEST_NAME} dryrun) -set_tests_properties(rocm-driver-6.1-install-dryrun PROPERTIES DISABLED ${IS_ROCM_61_DISABLED} TIMEOUT ${TIMEOUT_VALUE} LABELS "ci;6.1") +set_tests_properties(rocm-driver-6.1-install-dryrun PROPERTIES DISABLED ${IS_ROCM_61_DISABLED} TIMEOUT ${TIMEOUT_VALUE} LABELS "ci;6.1.0") # 6.0.2 add_test(NAME rocm-driver-6.0.2 @@ -215,13 +264,29 @@ set_tests_properties(rocm-driver-5.7.3-install-dryrun PROPERTIES DISABLED ${IS_R ############ rocm,graphics ############ +# 6.2.2 +add_test(NAME rocm-graphics-6.2.2 + COMMAND ${CMAKE_BINARY_DIR}/${PACKAGE_NAME}.run config=${CMAKE_SOURCE_DIR}/tests/create-test-rocm-graphics-6.2.2.config url=${URL_CONFIG}) +set_tests_properties(rocm-graphics-6.2.2 PROPERTIES DISABLED ${IS_ROCM_622_DISABLED} TIMEOUT ${TIMEOUT_VALUE} LABELS "6.2.2") + +add_test(NAME rocm-graphics-6.2.2-install-dryrun COMMAND ${INSTALLER_TEST_PATH}/${INSTALLER_TEST_NAME} dryrun) +set_tests_properties(rocm-graphics-6.2.2-install-dryrun PROPERTIES DISABLED ${IS_ROCM_622_DISABLED} TIMEOUT ${TIMEOUT_VALUE} LABELS "6.2.2") + +# 6.2.1 +add_test(NAME rocm-graphics-6.2.1 + COMMAND ${CMAKE_BINARY_DIR}/${PACKAGE_NAME}.run config=${CMAKE_SOURCE_DIR}/tests/create-test-rocm-graphics-6.2.1.config) +set_tests_properties(rocm-graphics-6.2.1 PROPERTIES DISABLED ${IS_ROCM_621_DISABLED} TIMEOUT ${TIMEOUT_VALUE} LABELS "6.2.1") + +add_test(NAME rocm-graphics-6.2.1-install-dryrun COMMAND ${INSTALLER_TEST_PATH}/${INSTALLER_TEST_NAME} dryrun) +set_tests_properties(rocm-graphics-6.2.1-install-dryrun PROPERTIES DISABLED ${IS_ROCM_621_DISABLED} TIMEOUT ${TIMEOUT_VALUE} LABELS "6.2.1") + # 6.2 add_test(NAME rocm-graphics-6.2 - COMMAND ${CMAKE_BINARY_DIR}/${PACKAGE_NAME}.run config=${CMAKE_SOURCE_DIR}/tests/create-test-rocm-graphics-6.2.config url=${URL_CONFIG}) -set_tests_properties(rocm-graphics-6.2 PROPERTIES DISABLED ${IS_ROCM_62_DISABLED} TIMEOUT ${TIMEOUT_VALUE} LABELS "6.2") + COMMAND ${CMAKE_BINARY_DIR}/${PACKAGE_NAME}.run config=${CMAKE_SOURCE_DIR}/tests/create-test-rocm-graphics-6.2.config) +set_tests_properties(rocm-graphics-6.2 PROPERTIES DISABLED ${IS_ROCM_62_DISABLED} TIMEOUT ${TIMEOUT_VALUE} LABELS "6.2.0") add_test(NAME rocm-graphics-6.2-install-dryrun COMMAND ${INSTALLER_TEST_PATH}/${INSTALLER_TEST_NAME} dryrun) -set_tests_properties(rocm-graphics-6.2-install-dryrun PROPERTIES DISABLED ${IS_ROCM_62_DISABLED} TIMEOUT ${TIMEOUT_VALUE} LABELS "6.2") +set_tests_properties(rocm-graphics-6.2-install-dryrun PROPERTIES DISABLED ${IS_ROCM_62_DISABLED} TIMEOUT ${TIMEOUT_VALUE} LABELS "6.2.0") # 6.1.3 add_test(NAME rocm-graphics-6.1.3 @@ -250,10 +315,10 @@ set_tests_properties(rocm-graphics-6.1.1-install-dryrun PROPERTIES DISABLED ${IS # 6.1 add_test(NAME rocm-graphics-6.1 COMMAND ${CMAKE_BINARY_DIR}/${PACKAGE_NAME}.run config=${CMAKE_SOURCE_DIR}/tests/create-test-rocm-graphics-6.1.config) -set_tests_properties(rocm-graphics-6.1 PROPERTIES DISABLED ${IS_ROCM_61_DISABLED} TIMEOUT ${TIMEOUT_VALUE} LABELS "6.1") +set_tests_properties(rocm-graphics-6.1 PROPERTIES DISABLED ${IS_ROCM_61_DISABLED} TIMEOUT ${TIMEOUT_VALUE} LABELS "6.1.0") add_test(NAME rocm-graphics-6.1-install-dryrun COMMAND ${INSTALLER_TEST_PATH}/${INSTALLER_TEST_NAME} dryrun) -set_tests_properties(rocm-graphics-6.1-install-dryrun PROPERTIES DISABLED ${IS_ROCM_61_DISABLED} TIMEOUT ${TIMEOUT_VALUE} LABELS "6.1") +set_tests_properties(rocm-graphics-6.1-install-dryrun PROPERTIES DISABLED ${IS_ROCM_61_DISABLED} TIMEOUT ${TIMEOUT_VALUE} LABELS "6.1.0") # 6.0.2 add_test(NAME rocm-graphics-6.0.2 @@ -273,13 +338,29 @@ set_tests_properties(rocm-graphics-5.7.3-install-dryrun PROPERTIES DISABLED ${IS ############ hip,hipsdk ############ +# 6.2.2 +add_test(NAME hip-hiplibsdk-6.2.2 + COMMAND ${CMAKE_BINARY_DIR}/${PACKAGE_NAME}.run config=${CMAKE_SOURCE_DIR}/tests/create-test-hip-hiplibsdk-6.2.2.config url=${URL_CONFIG}) +set_tests_properties(hip-hiplibsdk-6.2.2 PROPERTIES DISABLED ${IS_ROCM_622_DISABLED} TIMEOUT ${TIMEOUT_VALUE} LABELS "6.2.2") + +add_test(NAME hip-hiplibsdk-6.2.2-install-dryrun COMMAND ${INSTALLER_TEST_PATH}/${INSTALLER_TEST_NAME} dryrun) +set_tests_properties(hip-hiplibsdk-6.2.2-install-dryrun PROPERTIES DISABLED ${IS_ROCM_622_DISABLED} TIMEOUT ${TIMEOUT_VALUE} LABELS "6.2.2") + +# 6.2.1 +add_test(NAME hip-hiplibsdk-6.2.1 + COMMAND ${CMAKE_BINARY_DIR}/${PACKAGE_NAME}.run config=${CMAKE_SOURCE_DIR}/tests/create-test-hip-hiplibsdk-6.2.1.config) +set_tests_properties(hip-hiplibsdk-6.2.1 PROPERTIES DISABLED ${IS_ROCM_621_DISABLED} TIMEOUT ${TIMEOUT_VALUE} LABELS "6.2.1") + +add_test(NAME hip-hiplibsdk-6.2.1-install-dryrun COMMAND ${INSTALLER_TEST_PATH}/${INSTALLER_TEST_NAME} dryrun) +set_tests_properties(hip-hiplibsdk-6.2.1-install-dryrun PROPERTIES DISABLED ${IS_ROCM_621_DISABLED} TIMEOUT ${TIMEOUT_VALUE} LABELS "6.2.1") + # 6.2 add_test(NAME hip-hiplibsdk-6.2 - COMMAND ${CMAKE_BINARY_DIR}/${PACKAGE_NAME}.run config=${CMAKE_SOURCE_DIR}/tests/create-test-hip-hiplibsdk-6.2.config url=${URL_CONFIG}) -set_tests_properties(hip-hiplibsdk-6.2 PROPERTIES DISABLED ${IS_ROCM_62_DISABLED} TIMEOUT ${TIMEOUT_VALUE} LABELS "6.2") + COMMAND ${CMAKE_BINARY_DIR}/${PACKAGE_NAME}.run config=${CMAKE_SOURCE_DIR}/tests/create-test-hip-hiplibsdk-6.2.config) +set_tests_properties(hip-hiplibsdk-6.2 PROPERTIES DISABLED ${IS_ROCM_62_DISABLED} TIMEOUT ${TIMEOUT_VALUE} LABELS "6.2.0") add_test(NAME hip-hiplibsdk-6.2-install-dryrun COMMAND ${INSTALLER_TEST_PATH}/${INSTALLER_TEST_NAME} dryrun) -set_tests_properties(hip-hiplibsdk-6.2-install-dryrun PROPERTIES DISABLED ${IS_ROCM_62_DISABLED} TIMEOUT ${TIMEOUT_VALUE} LABELS "6.2") +set_tests_properties(hip-hiplibsdk-6.2-install-dryrun PROPERTIES DISABLED ${IS_ROCM_62_DISABLED} TIMEOUT ${TIMEOUT_VALUE} LABELS "6.2.0") # 6.1.3 add_test(NAME hip-hiplibsdk-6.1.3 @@ -308,10 +389,10 @@ set_tests_properties(hip-hiplibsdk-6.1.1-install-dryrun PROPERTIES DISABLED ${IS # 6.1 add_test(NAME hip-hiplibsdk-6.1 COMMAND ${CMAKE_BINARY_DIR}/${PACKAGE_NAME}.run config=${CMAKE_SOURCE_DIR}/tests/create-test-hip-hiplibsdk-6.1.config) -set_tests_properties(hip-hiplibsdk-6.1 PROPERTIES DISABLED ${IS_ROCM_61_DISABLED} TIMEOUT ${TIMEOUT_VALUE} LABELS "6.1") +set_tests_properties(hip-hiplibsdk-6.1 PROPERTIES DISABLED ${IS_ROCM_61_DISABLED} TIMEOUT ${TIMEOUT_VALUE} LABELS "6.1.0") add_test(NAME hip-hiplibsdk-6.1-install-dryrun COMMAND ${INSTALLER_TEST_PATH}/${INSTALLER_TEST_NAME} dryrun) -set_tests_properties(hip-hiplibsdk-6.1-install-dryrun PROPERTIES DISABLED ${IS_ROCM_61_DISABLED} TIMEOUT ${TIMEOUT_VALUE} LABELS "6.1") +set_tests_properties(hip-hiplibsdk-6.1-install-dryrun PROPERTIES DISABLED ${IS_ROCM_61_DISABLED} TIMEOUT ${TIMEOUT_VALUE} LABELS "6.1.0") # 6.0.2 add_test(NAME hip-hiplibsdk-6.0.2 diff --git a/src/offline-installer/tests/create-test-driver-only-6.2.1.config b/src/offline-installer/tests/create-test-driver-only-6.2.1.config new file mode 100755 index 00000000..8b51dce6 --- /dev/null +++ b/src/offline-installer/tests/create-test-driver-only-6.2.1.config @@ -0,0 +1,27 @@ +# Creator/Build Options +############################### +INSTALL_PACKAGE_TYPE=0 +INSTALL_PACKAGE_NAME="rocm-offline-install.run" +INSTALL_PACKAGE_DIR="$HOME" + +INSTALL_PACKAGE_REPO=0 + +DOWNLOAD_PKG_CONFIG_NUM=0 + +# ROCm Options +############################### +ROCM_USECASES=dkms +ROCM_VERSIONS=6.2.1 + +# Driver/amdgpu Options +############################### +AMDGPU_INSTALL_DRIVER=yes +AMDGPU_POST_INSTALL_VIDEO_RENDER_GRP=no +AMDGPU_POST_INSTALL_BLACKLIST=no +AMDGPU_POST_INSTALL_START=no + +# Extra Package Options +############################### +EXTRA_PACKAGES_ONLY=no +EXTRA_PACKAGES="" + diff --git a/src/offline-installer/tests/create-test-driver-only-6.2.2.config b/src/offline-installer/tests/create-test-driver-only-6.2.2.config new file mode 100755 index 00000000..02fc7894 --- /dev/null +++ b/src/offline-installer/tests/create-test-driver-only-6.2.2.config @@ -0,0 +1,27 @@ +# Creator/Build Options +############################### +INSTALL_PACKAGE_TYPE=0 +INSTALL_PACKAGE_NAME="rocm-offline-install.run" +INSTALL_PACKAGE_DIR="$HOME" + +INSTALL_PACKAGE_REPO=0 + +DOWNLOAD_PKG_CONFIG_NUM=0 + +# ROCm Options +############################### +ROCM_USECASES=dkms +ROCM_VERSIONS=6.2.2 + +# Driver/amdgpu Options +############################### +AMDGPU_INSTALL_DRIVER=yes +AMDGPU_POST_INSTALL_VIDEO_RENDER_GRP=no +AMDGPU_POST_INSTALL_BLACKLIST=no +AMDGPU_POST_INSTALL_START=no + +# Extra Package Options +############################### +EXTRA_PACKAGES_ONLY=no +EXTRA_PACKAGES="" + diff --git a/src/offline-installer/tests/create-test-hip-hiplibsdk-6.2.1.config b/src/offline-installer/tests/create-test-hip-hiplibsdk-6.2.1.config new file mode 100755 index 00000000..a3d81008 --- /dev/null +++ b/src/offline-installer/tests/create-test-hip-hiplibsdk-6.2.1.config @@ -0,0 +1,27 @@ +# Creator/Build Options +############################### +INSTALL_PACKAGE_TYPE=0 +INSTALL_PACKAGE_NAME="rocm-offline-install.run" +INSTALL_PACKAGE_DIR="$HOME" + +INSTALL_PACKAGE_REPO=0 + +DOWNLOAD_PKG_CONFIG_NUM=0 + +# ROCm Options +############################### +ROCM_USECASES=hip,hiplibsdk +ROCM_VERSIONS=6.2.1 + +# Driver/amdgpu Options +############################### +AMDGPU_INSTALL_DRIVER=no +AMDGPU_POST_INSTALL_VIDEO_RENDER_GRP=no +AMDGPU_POST_INSTALL_BLACKLIST=no +AMDGPU_POST_INSTALL_START=no + +# Extra Package Options +############################### +EXTRA_PACKAGES_ONLY=no +EXTRA_PACKAGES="" + diff --git a/src/offline-installer/tests/create-test-hip-hiplibsdk-6.2.2.config b/src/offline-installer/tests/create-test-hip-hiplibsdk-6.2.2.config new file mode 100755 index 00000000..3f8aa75c --- /dev/null +++ b/src/offline-installer/tests/create-test-hip-hiplibsdk-6.2.2.config @@ -0,0 +1,27 @@ +# Creator/Build Options +############################### +INSTALL_PACKAGE_TYPE=0 +INSTALL_PACKAGE_NAME="rocm-offline-install.run" +INSTALL_PACKAGE_DIR="$HOME" + +INSTALL_PACKAGE_REPO=0 + +DOWNLOAD_PKG_CONFIG_NUM=0 + +# ROCm Options +############################### +ROCM_USECASES=hip,hiplibsdk +ROCM_VERSIONS=6.2.2 + +# Driver/amdgpu Options +############################### +AMDGPU_INSTALL_DRIVER=no +AMDGPU_POST_INSTALL_VIDEO_RENDER_GRP=no +AMDGPU_POST_INSTALL_BLACKLIST=no +AMDGPU_POST_INSTALL_START=no + +# Extra Package Options +############################### +EXTRA_PACKAGES_ONLY=no +EXTRA_PACKAGES="" + diff --git a/src/offline-installer/tests/create-test-rocm-driver-6.2.1.config b/src/offline-installer/tests/create-test-rocm-driver-6.2.1.config new file mode 100755 index 00000000..36f06d0f --- /dev/null +++ b/src/offline-installer/tests/create-test-rocm-driver-6.2.1.config @@ -0,0 +1,27 @@ +# Creator/Build Options +############################### +INSTALL_PACKAGE_TYPE=0 +INSTALL_PACKAGE_NAME="rocm-offline-install.run" +INSTALL_PACKAGE_DIR="$HOME" + +INSTALL_PACKAGE_REPO=0 + +DOWNLOAD_PKG_CONFIG_NUM=0 + +# ROCm Options +############################### +ROCM_USECASES=rocm,dkms +ROCM_VERSIONS=6.2.1 + +# Driver/amdgpu Options +############################### +AMDGPU_INSTALL_DRIVER=yes +AMDGPU_POST_INSTALL_VIDEO_RENDER_GRP=no +AMDGPU_POST_INSTALL_BLACKLIST=no +AMDGPU_POST_INSTALL_START=no + +# Extra Package Options +############################### +EXTRA_PACKAGES_ONLY=no +EXTRA_PACKAGES="" + diff --git a/src/offline-installer/tests/create-test-rocm-driver-6.2.2.config b/src/offline-installer/tests/create-test-rocm-driver-6.2.2.config new file mode 100755 index 00000000..bbea5595 --- /dev/null +++ b/src/offline-installer/tests/create-test-rocm-driver-6.2.2.config @@ -0,0 +1,27 @@ +# Creator/Build Options +############################### +INSTALL_PACKAGE_TYPE=0 +INSTALL_PACKAGE_NAME="rocm-offline-install.run" +INSTALL_PACKAGE_DIR="$HOME" + +INSTALL_PACKAGE_REPO=0 + +DOWNLOAD_PKG_CONFIG_NUM=0 + +# ROCm Options +############################### +ROCM_USECASES=rocm,dkms +ROCM_VERSIONS=6.2.2 + +# Driver/amdgpu Options +############################### +AMDGPU_INSTALL_DRIVER=yes +AMDGPU_POST_INSTALL_VIDEO_RENDER_GRP=no +AMDGPU_POST_INSTALL_BLACKLIST=no +AMDGPU_POST_INSTALL_START=no + +# Extra Package Options +############################### +EXTRA_PACKAGES_ONLY=no +EXTRA_PACKAGES="" + diff --git a/src/offline-installer/tests/create-test-rocm-graphics-6.2.1.config b/src/offline-installer/tests/create-test-rocm-graphics-6.2.1.config new file mode 100755 index 00000000..1cd46b43 --- /dev/null +++ b/src/offline-installer/tests/create-test-rocm-graphics-6.2.1.config @@ -0,0 +1,27 @@ +# Creator/Build Options +############################### +INSTALL_PACKAGE_TYPE=0 +INSTALL_PACKAGE_NAME="rocm-offline-install.run" +INSTALL_PACKAGE_DIR="$HOME" + +INSTALL_PACKAGE_REPO=0 + +DOWNLOAD_PKG_CONFIG_NUM=0 + +# ROCm Options +############################### +ROCM_USECASES=rocm,graphics +ROCM_VERSIONS=6.2.1 + +# Driver/amdgpu Options +############################### +AMDGPU_INSTALL_DRIVER=no +AMDGPU_POST_INSTALL_VIDEO_RENDER_GRP=no +AMDGPU_POST_INSTALL_BLACKLIST=no +AMDGPU_POST_INSTALL_START=no + +# Extra Package Options +############################### +EXTRA_PACKAGES_ONLY=no +EXTRA_PACKAGES="" + diff --git a/src/offline-installer/tests/create-test-rocm-graphics-6.2.2.config b/src/offline-installer/tests/create-test-rocm-graphics-6.2.2.config new file mode 100755 index 00000000..3c9c5518 --- /dev/null +++ b/src/offline-installer/tests/create-test-rocm-graphics-6.2.2.config @@ -0,0 +1,27 @@ +# Creator/Build Options +############################### +INSTALL_PACKAGE_TYPE=0 +INSTALL_PACKAGE_NAME="rocm-offline-install.run" +INSTALL_PACKAGE_DIR="$HOME" + +INSTALL_PACKAGE_REPO=0 + +DOWNLOAD_PKG_CONFIG_NUM=0 + +# ROCm Options +############################### +ROCM_USECASES=rocm,graphics +ROCM_VERSIONS=6.2.2 + +# Driver/amdgpu Options +############################### +AMDGPU_INSTALL_DRIVER=no +AMDGPU_POST_INSTALL_VIDEO_RENDER_GRP=no +AMDGPU_POST_INSTALL_BLACKLIST=no +AMDGPU_POST_INSTALL_START=no + +# Extra Package Options +############################### +EXTRA_PACKAGES_ONLY=no +EXTRA_PACKAGES="" + diff --git a/src/offline-installer/tests/create-test-rocm-only-6.2.1.config b/src/offline-installer/tests/create-test-rocm-only-6.2.1.config new file mode 100755 index 00000000..12a897f3 --- /dev/null +++ b/src/offline-installer/tests/create-test-rocm-only-6.2.1.config @@ -0,0 +1,27 @@ +# Creator/Build Options +############################### +INSTALL_PACKAGE_TYPE=0 +INSTALL_PACKAGE_NAME="rocm-offline-install.run" +INSTALL_PACKAGE_DIR="$HOME" + +INSTALL_PACKAGE_REPO=0 + +DOWNLOAD_PKG_CONFIG_NUM=0 + +# ROCm Options +############################### +ROCM_USECASES=rocm +ROCM_VERSIONS=6.2.1 + +# Driver/amdgpu Options +############################### +AMDGPU_INSTALL_DRIVER=no +AMDGPU_POST_INSTALL_VIDEO_RENDER_GRP=no +AMDGPU_POST_INSTALL_BLACKLIST=no +AMDGPU_POST_INSTALL_START=no + +# Extra Package Options +############################### +EXTRA_PACKAGES_ONLY=no +EXTRA_PACKAGES="" + diff --git a/src/offline-installer/tests/create-test-rocm-only-6.2.2.config b/src/offline-installer/tests/create-test-rocm-only-6.2.2.config new file mode 100755 index 00000000..ff24ae7f --- /dev/null +++ b/src/offline-installer/tests/create-test-rocm-only-6.2.2.config @@ -0,0 +1,27 @@ +# Creator/Build Options +############################### +INSTALL_PACKAGE_TYPE=0 +INSTALL_PACKAGE_NAME="rocm-offline-install.run" +INSTALL_PACKAGE_DIR="$HOME" + +INSTALL_PACKAGE_REPO=0 + +DOWNLOAD_PKG_CONFIG_NUM=0 + +# ROCm Options +############################### +ROCM_USECASES=rocm +ROCM_VERSIONS=6.2.2 + +# Driver/amdgpu Options +############################### +AMDGPU_INSTALL_DRIVER=no +AMDGPU_POST_INSTALL_VIDEO_RENDER_GRP=no +AMDGPU_POST_INSTALL_BLACKLIST=no +AMDGPU_POST_INSTALL_START=no + +# Extra Package Options +############################### +EXTRA_PACKAGES_ONLY=no +EXTRA_PACKAGES="" +