Skip to content

Commit b52cb1d

Browse files
authored
Revert "[] Adds origami to TheRock build and tests" (#4901)
Reverts #3820 still failing the sdk tests. I think we need this in the toml file: ``` [components.dbg."math-libs/BLAS/origami/stage"] exclude = ["lib/python*/**"] [components.dev."math-libs/BLAS/origami/stage"] exclude = ["lib/python*/**"] [components.lib."math-libs/BLAS/origami/stage"] exclude = ["lib/python*/**"] [components.test."math-libs/BLAS/origami/stage"] include = [ "bin/origami-tests*", "bin/origami/**", "lib/python*/site-packages/**", ] ```
1 parent 2c9ac6c commit b52cb1d

7 files changed

Lines changed: 4 additions & 203 deletions

File tree

build_tools/github_actions/fetch_test_configurations.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -116,14 +116,6 @@ def _get_script_path(script_name: str) -> str:
116116
],
117117
},
118118
},
119-
"origami": {
120-
"job_name": "origami",
121-
"fetch_artifact_args": "--blas --tests",
122-
"timeout_minutes": 5,
123-
"test_script": f"python {_get_script_path('test_origami.py')}",
124-
"platform": ["linux", "windows"],
125-
"total_shards": 1,
126-
},
127119
"hipblas": {
128120
"job_name": "hipblas",
129121
"fetch_artifact_args": "--blas --tests",

build_tools/github_actions/test_executable_scripts/test_origami.py

Lines changed: 0 additions & 86 deletions
This file was deleted.

build_tools/packaging/linux/package.json

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -526,14 +526,7 @@
526526
"doc"
527527
]
528528
},
529-
{
530-
"Name": "origami",
531-
"Components": [
532-
"lib",
533-
"run",
534-
"doc"
535-
]
536-
},
529+
537530
{
538531
"Name": "hipBLASLt",
539532
"Components": [

build_tools/packaging/python/templates/rocm/src/rocm_sdk/_dist_info.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,6 @@ def determine_target_family() -> str:
272272
LibraryEntry("hipsolver", "libraries", "libhipsolver.so*", "hipsolver*.dll")
273273
LibraryEntry("rccl", "libraries", "librccl.so*", "")
274274
LibraryEntry("miopen", "libraries", "libMIOpen.so*", "MIOpen*.dll")
275-
LibraryEntry("origami", "libraries", "liborigami.so*", "origami*.dll")
276275
LibraryEntry("hipdnn", "libraries", "libhipdnn_backend.so*", "hipdnn_backend*.dll")
277276

278277
# Others we may want:

math-libs/BLAS/CMakeLists.txt

Lines changed: 3 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Copyright Advanced Micro Devices, Inc.
2+
# SPDX-License-Identifier: MIT
3+
14
# Many things need to be configured with paths to additional LLVM tools.
25
# If a project is using an amd-hip or amd-llvm toolchain, then it will already
36
# have an implicit dep on the toolchain, so it is safe to reference binaries
@@ -90,37 +93,6 @@ if(_enable_rocRoller)
9093
endif()
9194

9295

93-
##############################################################################
94-
# origami
95-
##############################################################################
96-
97-
therock_cmake_subproject_declare(origami
98-
EXTERNAL_SOURCE_DIR "${THEROCK_ROCM_LIBRARIES_SOURCE_DIR}/shared/origami"
99-
BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/origami"
100-
BACKGROUND_BUILD
101-
CMAKE_ARGS
102-
-DHIP_PLATFORM=amd
103-
-DORIGAMI_BUILD_SHARED_LIBS=ON
104-
-DORIGAMI_BUILD_TESTING=${THEROCK_BUILD_TESTING}
105-
-DORIGAMI_ENABLE_PYTHON=ON
106-
-DORIGAMI_ENABLE_FETCH=OFF
107-
COMPILER_TOOLCHAIN
108-
amd-hip
109-
BUILD_DEPS
110-
rocm-cmake
111-
therock-catch2
112-
RUNTIME_DEPS
113-
hip-clr
114-
)
115-
therock_cmake_subproject_glob_c_sources(origami
116-
SUBDIRS
117-
.
118-
)
119-
therock_cmake_subproject_provide_package(origami origami lib/cmake/origami)
120-
therock_cmake_subproject_activate(origami)
121-
list(APPEND _blas_subproject_names origami)
122-
123-
12496
##############################################################################
12597
# hipBLASLt
12698
##############################################################################
@@ -177,7 +149,6 @@ therock_cmake_subproject_declare(hipBLASLt
177149
${hipBLASLt_rocRoller_build_deps}
178150
RUNTIME_DEPS
179151
hip-clr
180-
origami
181152
therock-host-blas
182153
${hipBLASLt_rocRoller_runtime_deps}
183154
${hipBLASLt_runtime_deps}

math-libs/BLAS/artifact-blas.toml

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -23,27 +23,6 @@ include = [
2323
]
2424
optional = true
2525

26-
# origami
27-
[components.dbg."math-libs/BLAS/origami/stage"]
28-
[components.dev."math-libs/BLAS/origami/stage"]
29-
[components.lib."math-libs/BLAS/origami/stage"]
30-
exclude = [
31-
# Python extension modules are cpython-version-specific ABI binaries (e.g.
32-
# origami.cpython-312-x86_64-linux-gnu.so). They must not be included in
33-
# the python-version-agnostic rocm-sdk lib package, where
34-
# testSharedLibrariesLoad would try to ctypes.CDLL() them from a different
35-
# Python version and fail. They are distributed via the test component only.
36-
"lib/python*/**",
37-
]
38-
[components.test."math-libs/BLAS/origami/stage"]
39-
include = [
40-
"bin/origami-tests*",
41-
"bin/origami/**",
42-
# Python extension is fetched here so the test script can set PYTHONPATH
43-
# to lib/pythonX.Y/site-packages/ for ctest Python tests.
44-
"lib/python*/site-packages/**",
45-
]
46-
4726
# hipBLAS
4827
[components.lib."math-libs/BLAS/hipBLAS/stage"]
4928
exclude = [

math-libs/BLAS/post_hook_origami.cmake

Lines changed: 0 additions & 47 deletions
This file was deleted.

0 commit comments

Comments
 (0)