From 529b8b6e29e23f04b4022b8a207deb4d47050aa9 Mon Sep 17 00:00:00 2001 From: Di Nguyen Date: Thu, 4 Jul 2024 09:51:45 -0600 Subject: [PATCH] Fixed FileNotFound error when passing path to --install_dir while running rtest.py on windows (#561) * Fixed FileNotFound error on windows * --- (#562) updated-dependencies: - dependency-name: requests dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Enable external CI pipeline triggers (#560) * updated changelog * updated copyright in rtest.py * fixed copyright to 2021-2024 * Update Read the Docs config to Python 3.10 and latest rocm-docs-core (#564) * cmake: don't set CMAKE_C_COMPILER, as rocPRIM is a CXX project (#568) * Bump rocm-docs-core from 1.2.0 to 1.4.0 in /docs/sphinx (#569) Bumps [rocm-docs-core](https://github.com/ROCm/rocm-docs-core) from 1.2.0 to 1.4.0. - [Release notes](https://github.com/ROCm/rocm-docs-core/releases) - [Changelog](https://github.com/ROCm/rocm-docs-core/blob/develop/CHANGELOG.md) - [Commits](https://github.com/ROCm/rocm-docs-core/compare/v1.2.0...v1.4.0) --- updated-dependencies: - dependency-name: rocm-docs-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Fixed FileNotFound error on windows * updated changelog * updated copyright in rtest.py * fixed copyright to 2021-2024 --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Joseph Macaranas <145489236+amd-jmacaran@users.noreply.github.com> Co-authored-by: Sam Wu <22262939+samjwu@users.noreply.github.com> Co-authored-by: Steve Leung --- CHANGELOG.md | 7 +++++++ rtest.py | 6 ++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 829a5bdd5..347dbb71f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ Documentation for rocPRIM is available at [https://rocm.docs.amd.com/projects/rocPRIM/en/latest/](https://rocm.docs.amd.com/projects/rocPRIM/en/latest/). +## Unreleased rocPRIM-3.3.0 for ROCm 6.3.0 + +### Fixes +* Fixed an issue where while running rtest.py on windows and passing in an absolute path to --install_dir + causes FileNotFound error + + ## Unreleased rocPRIM-3.2.0 for ROCm 6.2.0 ### Additions diff --git a/rtest.py b/rtest.py index 4f50f6965..8ee7ca03d 100644 --- a/rtest.py +++ b/rtest.py @@ -1,5 +1,5 @@ #!/usr/bin/python3 -"""Copyright 2021 Advanced Micro Devices, Inc. +"""Copyright (c) 2021-2024 Advanced Micro Devices, Inc. All rights reserved. Run tests on build""" import re @@ -211,7 +211,9 @@ def batch(script, xml): else: if args.debug: build_type = "debug" else: build_type = "release" - test_dir = f"{args.install_dir}//{build_type}//test" + # deal with windows pathing + install_dir = '//'.join(args.install_dir.split('\\')) + test_dir = f"{install_dir}//{build_type}//test" fail = False for i in range(len(script)): cmdline = script[i]