Update ollama_v0.13.1_ubi_9.6.sh#7859
Conversation
shalinib-ibm
force-pushed
the
patch-2
branch
2 times, most recently
from
ec3f4e1 to
52bf03a
Compare
|
@shubham-dayma-ibm Can you please help review this patch ? |
|
@Pratikt2312 Can you please help review this Patch ? |
o/ollama/ollama_v0.13.1_ubi_9.6.sh
Outdated
| echo "**** Downloading Power10 patches..." | ||
| wget -q -O build_power.patch https://github.com/ollama/ollama/commit/67b8d3c817fbdc57fedad9b032d0efc10285220a.patch | ||
| wget -q -O set_threads_env.patch https://github.com/ollama/ollama/commit/a86b8152e0f37c0c117ba7acd2a940e3ba5f07d9.patch | ||
| wget -q -O enable_mma.patch https://github.com/ollama/ollama/commit/fe924304809ae8e6bd6957b0ce5759eb2a796d42.patch |
There was a problem hiding this comment.
Help me to understand why are we pulling patches from upstream that too with commit IDs? And if we ever have to pull it from upstream didn't it should be part of eaither main or release specific tag/branch?
Have we pushed these patches to upstream and upstream didn't merged it yet? Are we expecting these patches will be merged in upstream code? If the answer is "No", first raise the PRs to build-script repo with patches only. Later raise actual build-script PR to build ollama, in which you are downloading these patches from build-script repo itself and applying those.
There was a problem hiding this comment.
I am raising these question because you are trying to remove same patches from build-script repo.
There was a problem hiding this comment.
@shubham-dayma-ibm . Open Source Ollama community has not yet accepted powerpc as a supported platform for ollama yet. We are working with them to merge our changes to main but we do not have a clear line of sight as to when they will be merged.
If we raise these power specifc changes as patches, we are facing failure in GHA as only the script is being copied to work dir and not the patches .
this is the error:
** Applying Power10 Patches...
temp_build_script.sh: line 74: /home/tester/gha-script/build_power_v0.13.1.patch: No such file or directory
Traceback (most recent call last):
File "/tmp/_actions-runner-working-dir/build-scripts/build-scripts/gha-script/build_wheels.py", line 72, in <module>
trigger_build_wheel(sys.argv[1],sys.argv[2],sys.argv[3],sys.argv[4],sys.argv[5])
File "/tmp/_actions-runner-working-dir/build-scripts/build-scripts/gha-script/build_wheels.py", line 66, in trigger_build_wheel
raise Exception(f"Build script validation failed for {file_name}!")
Exception: Build script validation failed for o/ollama/ollama_v0.13.1_ubi_9.6.sh!
Script execution failed for o/ollama/ollama_v0.13.1_ubi_9.6.sh v0.13.1
There was a problem hiding this comment.
Okay for the interim, please raise only PR with patches first, once that is merged raise 2nd PR with actual build-script that downloads these patches from build-script repo itself.
As an example:
https://github.com/ppc64le/build-scripts/pull/7848/changes#diff-64fc971329984b82d8fa02ad7d57eae1c7c98d206e794f1c794f821ea652eab0R216-R217
There was a problem hiding this comment.
@shubham-dayma-ibm Thanks for the input. Since the patches are already available in o/ollama/ , I have modified build-script to do what you mentioned as step 2 in this PR itself. Can you please check now ?
The build-script is executed as a single file without patch file in a CI pipeline. So, downloading the patches directly from git and applying to fix patch not found failure errors.
3 participants
The build-script is executed as a single file without patch file in a CI pipeline.
So, downloading the patches directly from git and applying to fix patch not found failure errors
Checklist
set -eoption enabled and observe success ?