Skip to content

Commit 1c33d22

Browse files
authored
[mac_ai] Release the latest version (#903)
<!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **Chores** * Updated testing configuration by bumping two test-related version values to keep the test environment current. * No functional or user-facing behavior changes; modifications are limited to test infrastructure to improve CI reliability and validation. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
2 parents 0e164eb + 4efa602 commit 1c33d22

File tree

4 files changed

+39
-5
lines changed

4 files changed

+39
-5
lines changed

projects/mac_ai/testing/config.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ ci_presets:
3131
remote_host.description: "crc-lab-mac5"
3232
prepare.cleanup_on_exit: true
3333
remote_host.env.PATH: "/opt/homebrew/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/opt/podman/bin"
34+
prepare.brew._libomp.version: "22.1.0"
35+
3436
mac-m4:
3537
secrets.hostname: mac_ai__hostname.mac-m4
3638
secrets.username: mac_ai__username.mac-m4
@@ -140,12 +142,12 @@ ci_presets:
140142
prepare.podman.machine.remoting_env.enabled: true
141143
prepare.virglrenderer.enabled: true
142144
prepare.llama_cpp.source.repo.url: https://github.com/ggml-org/llama.cpp
143-
prepare.llama_cpp.source.repo.version: b7944
145+
prepare.llama_cpp.source.repo.version: b8163
144146
prepare.virglrenderer.repo.branch: v1.2.0-remoting-0.3.6
145147
prepare.ramalama.build_image.enabled: true
146148
prepare.ramalama.build_image.name: remoting
147149
prepare.ramalama.repo.url: https://github.com/kpouget/ramalama
148-
prepare.ramalama.repo.version: v0.17.0-apir.0.1.4-rc10
150+
prepare.ramalama.repo.version: v0.17.0-apir.0.1.5-rc3
149151
prepare.remoting.podman_desktop_extension.repo.version: v0.1.3
150152

151153
remoting_wip:

projects/mac_ai/testing/ramalama.py

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,16 @@ def download_ramalama(base_work_dir, dest, version):
6969
remote_access.run_with_ansible_ssh_conf(base_work_dir, "git show -s --format='%cd%n%s%n%H' --date=format:'%y%m%d.%H%M' > ramalama-commit.info",
7070
chdir=dest)
7171

72+
remote_access.run_with_ansible_ssh_conf(
73+
base_work_dir,
74+
f"""
75+
cd '{dest}'
76+
python3 -m venv venv
77+
source venv/bin/activate
78+
pip install -e .
79+
"""
80+
)
81+
7282

7383
def build_container_image(base_work_dir, ramalama_path, platform):
7484
image_name = config.project.get_config("prepare.ramalama.build_image.name")
@@ -290,7 +300,13 @@ def _run(base_work_dir, platform, ramalama_path, ramalama_cmd, *, check=False, c
290300

291301
return remote_access.run_with_ansible_ssh_conf(
292302
base_work_dir,
293-
f"{ramalama_path} {ramalama_cmd}",
303+
f"""
304+
cd '{ramalama_path.parent.parent}'
305+
python3 -m venv venv
306+
source venv/bin/activate
307+
cd '{base_work_dir}'
308+
309+
{ramalama_path} {ramalama_cmd}""",
294310
check=check, capture_stdout=capture_stdout, capture_stderr=capture_stderr,
295311
extra_env=extra_env,
296312
)

projects/mac_ai/toolbox/mac_ai_remote_ramalama_run_bench/tasks/main.yml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,19 @@
77

88
- name: Run the ramalama bench benchmark
99
shell: |
10+
set -o pipefail
11+
set -o errexit
12+
set -o nounset
13+
set -o errtrace
14+
1015
export {{ mac_ai_remote_ramalama_run_bench_env }}
1116
12-
$timeout {{ mac_ai_remote_ramalama_run_bench_path }} \
17+
cd "$PYTHONPATH"
18+
python3 -m venv venv
19+
source venv/bin/activate
20+
cd -
21+
22+
{{ mac_ai_remote_ramalama_run_bench_path }} \
1323
bench \
1424
--image {{ mac_ai_remote_ramalama_run_bench_image }} \
1525
{{ mac_ai_remote_ramalama_run_bench_model_name }} \
@@ -37,7 +47,7 @@
3747
if [ $RESULT -eq 143 ] || [ $RESULT -eq 137 ]; then
3848
echo "Task timed out!"
3949
exit 1
40-
elif [ ! $RESULT -eq 0 ]]; then
50+
elif [ ! $RESULT -eq 0 ]; then
4151
echo "Task failed ($RESULT) :/"
4252
exit 1
4353
else

projects/mac_ai/toolbox/mac_ai_remote_ramalama_run_model/tasks/main.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,12 @@
2626
- name: Start serving the ramalama model
2727
shell: |
2828
export {{ mac_ai_remote_ramalama_run_model_env }}
29+
30+
cd "$PYTHONPATH"
31+
python3 -m venv venv
32+
source venv/bin/activate
33+
cd -
34+
2935
nohup {{ mac_ai_remote_ramalama_run_model_path }} \
3036
--debug \
3137
serve \

0 commit comments

Comments
 (0)