Merged updates from Comfy-Org/comfy-aimdo#20 and Windows build chore by Apophis3158 · Pull Request #6 · asagi4/comfy-aimdo

Apophis3158 · 2026-03-12T07:19:31Z

Merged updates from allocators: Dont use the VMA allocator for cuda_malloc Comfy-Org/comfy-aimdo#20
Windows chore: clang building use pwsh to pass args but not rsp file

Tested on RX 9070 XT (gfx1201), Windows 10, torch 2.10.0+rocm7.12.0a20260304: example.py debug log

…te OOM

These are deprecated on HIP. Apparently you're supposed to use device and stream APIs

0xDELUXA · 2026-03-12T13:08:21Z

 Remove-Item -Recurse -Force $detoursDir
 Write-Host "Build successful: comfy_aimdo\aimdo_rocm.dll"
+
+# Copy amdhip64_7.dll to comfy_aimdo directory


What about this?

Finally we don't need to copy at all

Will try this PR locally - would be great if it works.

Don't try this yet, it seems specified 4 hooks working well because using _rocm_sdk_core, but Adrenalin one loaded first still used somewhere and will cause hang.

You're right, we need to investigate further to ensure it doesn’t use the driver .dll at all.

Apophis3158 · 2026-03-12T21:11:51Z

Update: use _dupenv_s to get $env:VIRTUAL_ENV 626a7a6

❯ py .\examples\example.py  
HIP Library Path: C:\WINDOWS\SYSTEM32\amdhip64_7.dll
aimdo: src-win\cuda-detour.c:88:DEBUG:aimdo_setup_hooks: found VIRTUAL_ENV: H:\ROCm\ComfyUI\.venv
aimdo: src-win\cuda-detour.c:96:DEBUG:aimdo_setup_hooks: driver_dlls[0] = H:\ROCm\ComfyUI\.venv\Lib\site-packages\_rocm_sdk_core\bin\amdhip64.dll
aimdo: src-win\cuda-detour.c:96:DEBUG:aimdo_setup_hooks: driver_dlls[1] = H:\ROCm\ComfyUI\.venv\Lib\site-packages\_rocm_sdk_core\bin\amdhip64_7.dll
aimdo: src-win\cuda-detour.c:117:INFO:aimdo_setup_hooks: found driver at 00007FFAD7A40000, installing 4 hooks
aimdo: src-win\cuda-detour.c:70:DEBUG:install_hook_entrys: hooks successfully installed
aimdo: src\control.c:69:INFO:comfy-aimdo inited for GPU: AMD Radeon RX 9070 XT (VRAM: 16304 MB)

HIP Library Path: C:\WINDOWS\SYSTEM32\amdhip64_7.dll still shows up but don't worry, we actual using the _rocm_sdk_core one, because example running well (full log), if the Adrenalin one is used, system will hang.

0xDELUXA · 2026-03-12T21:16:52Z

example.py works with C:\WINDOWS\SYSTEM32\amdhip64_7.dll too, but Comfy doesn't: Comfy-Org#2 (comment).
Have you tried it?

Apophis3158 · 2026-03-12T21:20:48Z

example.py works with C:\WINDOWS\SYSTEM32\amdhip64_7.dll too, but Comfy doesn't: Comfy-Org#2 (comment)

In my system running example.py with Adrenalin 26.2.2 C:\WINDOWS\SYSTEM32\amdhip64_7.dll always hang.

I'll try this test case later.

0xDELUXA · 2026-03-12T21:37:01Z

+            if ((ret < 0) || (ret >= BUFF_SIZE)) {
+                log(ERROR, "%s: Buffer overflow in snprintf\n", __func__);
+            } else {
+                log(DEBUG, "%s: driver_dlls[%d] = %s\n", __func__, i, driver_dlls[i]);


This prints:

aimdo: src-win\cuda-detour.c:96:DEBUG:aimdo_setup_hooks: driver_dlls[0] = C:\ComfyUI\venv\Lib\site-packages\_rocm_sdk_core\bin\amdhip64.dll aimdo: src-win\cuda-detour.c:96:DEBUG:aimdo_setup_hooks: driver_dlls[1] = C:\ComfyUI\venv\Lib\site-packages\_rocm_sdk_core\bin\amdhip64_7.dll

The first file (_rocm_sdk_core\bin\amdhip64.dll) doesn't exist on my system, and presumably not on yours either - this print should be removed.
AMD renamed/versioned it - what used to be amdhip64.dll is now amdhip64_7.dll on current drivers. (AFAIK amdhip64.dll = ROCm 5, amdhip64_6.dll = ROCm 6)

0xDELUXA · 2026-03-12T21:44:26Z

+
+    ret = _dupenv_s(&venv, &buff_size, "VIRTUAL_ENV");
+    if ((ret == 0) && (venv != NULL)) {
+        log(DEBUG, "%s: found VIRTUAL_ENV: %s\n", __func__, venv);


I think we shouldn't really add more debug logs - the console is already crowded enough, as the original NVIDIA Windows version already has three aimdo-related prints.

Apophis3158 · 2026-03-13T02:33:52Z

@0xDELUXA after some further tests and looking up, I became frustrated with C:\WINDOWS\SYSTEM32\amdhip64_7.dll, loading it always cause system unstable, the only thing we can do is put _rocm_sdk_core one in package.

This PR only retains merge Comfy-Org#20 and Windows chore.

Apophis3158 · 2026-03-13T02:54:04Z

In some PR, setting PATH to dll will fix loading, but didn't work with me.
ROCm/TheRock#2019
ROCm/TheRock#3257
ggml-org/llama.cpp#17429 (comment) (use rocm-sdk path --bin or hipconfig --rocmpath)

And this print come out when torch is called first time, such as torch.cuda.current_device() in example.py or torch.cuda.is_available() from comfy_kitchen in ComfyUI. Maybe the right dll was loaded without print when aimdo not installed, then the wrong dll will be load with print when aimdo installed, but why?

Apophis3158 · 2026-03-13T02:55:25Z

@asagi4 please help test this merge on Linux.

0xDELUXA · 2026-03-13T08:04:02Z

In some PR, setting PATH to dll will fix loading, but didn't work with me.

Same here.

Maybe the right dll was loaded without print when aimdo not installed, then the wrong dll will be load with print when aimdo installed, but why?

Indeed. But why would that happen? That’s what I’d like to know too.

0xDELUXA · 2026-03-13T08:06:26Z

@0xDELUXA after some further tests and looking up, I became frustrated with C:\WINDOWS\SYSTEM32\amdhip64_7.dll, loading it always cause system unstable, the only thing we can do is put _rocm_sdk_core one in package.

This PR only retains merge Comfy-Org#20 and Windows chore.

So we stick with the manual copy approach then?

0xDELUXA · 2026-03-13T08:09:08Z

 # ── Compile ────────────────────────────────────────────────────────────────────
-$sources = @(Get-Item "$root\src\*.c" -ErrorAction SilentlyContinue) + @(Get-Item "$root\src-win\*.c" -ErrorAction SilentlyContinue) | ForEach-Object { "`"$(F $_.FullName)`"" }
-if (-not $sources) { throw "No .c source files found in src\ or src-win\." }
+# use pure command to build: pwsh will handel *.c expanding and \ slash


Typo: handel should be handle.

@asagi4 Looks like this typo made its way into the PR as-is: Comfy-Org@8480e31#diff-d876599642c83c7fd9405bc52e67f83c7172209100023d010558721949f39db0R36

Fixed in PR #7 7abda54

asagi4 · 2026-03-13T09:09:04Z

I can take a look later. I don't mind keeping the support PR up to date with changes to master but since on Linux making aimdo work seems to depend entirely on AMD fixing HIP / rocr (unless someone can figure out a workaround), I'm not really actively working on it at the moment.

0xDELUXA · 2026-03-13T09:49:05Z

Yeah, we ran into problems that we can't fix locally. AMD should look at the Linux side regarding the hipMemRelease issue, and the triton-windows devs should look at the Windows side regarding triton's CPU tensor? issue. We've opened issues and are waiting for any feedback.

asagi4 · 2026-03-13T15:42:48Z

I merged this manually and dropped some of the type fixes and just downgraded the incompatible pointer type errors to warnings.

asagi4 and others added 18 commits March 9, 2026 17:18

Use %p to print pointers

06d9134

Add platform-specific defines to enable compilation with HIP

0618abe

HIP async support needs access to the original functions on Linux

929948b

Simultaneous cuda+rocm support

63024a4

Assume nvidia if autodetection fails

e7d1b45

ROCm build script

c1464c7

HIP: Windows support

d92cc8a

Add Windows ROCm build script

6b71988

Safely handle lib cleanup in model_vbar

453e67e

Improve validation and error handling in Windows ROCm build script

5b7600f

Fix windows build script

bb3aa9a

Grammar fixes

2f61ca3

Detect required library from torch version

b62175d

Aligning up to chunk size is still needed, otherwise I get an immedia…

3c4f98c

…te OOM

Fix error types

cd3fbb6

HIP: Context support

bd6b9bf

These are deprecated on HIP. Apparently you're supposed to use device and stream APIs

Merge remote-tracking branch 'comfy/master' into dev

6bdf516

Use %p to print pointers

a6ec0a0

Apophis3158 changed the title ~~Asagi4/rocm support~~ Merged updates from Comfy-Org/comfy-aimdo and Windows chore Mar 12, 2026

Apophis3158 changed the title ~~Merged updates from Comfy-Org/comfy-aimdo and Windows chore~~ Merged updates from Comfy-Org/comfy-aimdo#20 and Windows chore Mar 12, 2026

0xDELUXA reviewed Mar 12, 2026

View reviewed changes

Apophis3158 force-pushed the asagi4/rocm-support branch from 3dae483 to afbd5c1 Compare March 12, 2026 20:40

Apophis3158 changed the title ~~Merged updates from Comfy-Org/comfy-aimdo#20 and Windows chore~~ Merged updates from Comfy-Org/comfy-aimdo#20 and Windows load DLL from $env:VIRTUAL_ENV Mar 12, 2026

Apophis3158 mentioned this pull request Mar 12, 2026

Win: Auto-copy amdhip64_7.dll from ROCm SDK to site-packages\comfy_aimdo\ #4

Closed

0xDELUXA reviewed Mar 12, 2026

View reviewed changes

chore: update .gitignore

14c1319

Win building: Use pwsh to pass args but not rsp file

965a63d

Apophis3158 force-pushed the asagi4/rocm-support branch from afbd5c1 to 965a63d Compare March 13, 2026 02:27

Apophis3158 changed the title ~~Merged updates from Comfy-Org/comfy-aimdo#20 and Windows load DLL from $env:VIRTUAL_ENV~~ Merged updates from Comfy-Org/comfy-aimdo#20 and Windows build chore Mar 13, 2026

0xDELUXA reviewed Mar 13, 2026

View reviewed changes

asagi4 force-pushed the hack/rocm-support branch from bd6b9bf to 80ce863 Compare March 13, 2026 15:41

asagi4 closed this Mar 13, 2026

Conversation

Apophis3158 commented Mar 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Apophis3158 commented Mar 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

0xDELUXA commented Mar 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Apophis3158 commented Mar 12, 2026

Uh oh!

0xDELUXA Mar 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Apophis3158 commented Mar 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Apophis3158 commented Mar 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Apophis3158 commented Mar 13, 2026

Uh oh!

0xDELUXA commented Mar 13, 2026

Uh oh!

0xDELUXA commented Mar 13, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

0xDELUXA Mar 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

asagi4 commented Mar 13, 2026

Uh oh!

0xDELUXA commented Mar 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

asagi4 commented Mar 13, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Apophis3158 commented Mar 12, 2026 •

edited

Loading

Apophis3158 commented Mar 12, 2026 •

edited

Loading

0xDELUXA commented Mar 12, 2026 •

edited

Loading

0xDELUXA Mar 12, 2026 •

edited

Loading

Apophis3158 commented Mar 13, 2026 •

edited

Loading

Apophis3158 commented Mar 13, 2026 •

edited

Loading

0xDELUXA Mar 13, 2026 •

edited

Loading

0xDELUXA commented Mar 13, 2026 •

edited

Loading