Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions devops/containers/ubuntu2204_intel_drivers.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,13 @@ USER root

RUN apt update && apt install -yqq wget

COPY scripts/get_release.py /
COPY scripts/install_drivers.sh /
COPY dependencies.json /

RUN mkdir /runtimes
ENV INSTALL_LOCATION=/runtimes
RUN --mount=type=secret,id=github_token \
GITHUB_TOKEN=$(cat /run/secrets/github_token) /install_drivers.sh dependencies.json --all
GITHUB_TOKEN=$(cat /run/secrets/github_token) /install_drivers.sh dependencies.json --igfx --cpu

COPY scripts/drivers_entrypoint.sh /drivers_entrypoint.sh

Expand Down
3 changes: 1 addition & 2 deletions devops/containers/ubuntu2404_intel_drivers.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,13 @@ USER root

RUN apt update && apt install -yqq wget

COPY scripts/get_release.py /
COPY scripts/install_drivers.sh /
COPY dependencies.json /

RUN mkdir /runtimes
ENV INSTALL_LOCATION=/runtimes
RUN --mount=type=secret,id=github_token \
GITHUB_TOKEN=$(cat /run/secrets/github_token) /install_drivers.sh dependencies.json --all
GITHUB_TOKEN=$(cat /run/secrets/github_token) /install_drivers.sh dependencies.json --igfx --cpu

COPY scripts/drivers_entrypoint.sh /drivers_entrypoint.sh

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ USER root

RUN apt update && apt install -yqq libllvm14 libllvm15 libz3-4

COPY scripts/get_release.py /
COPY scripts/install_drivers.sh /
COPY dependencies.json /
COPY dependencies-igc-dev.json /
Expand All @@ -18,7 +17,7 @@ RUN mkdir /runtimes
ENV INSTALL_LOCATION=/runtimes
RUN --mount=type=secret,id=github_token \
install_driver_opt="dependencies.json dependencies-igc-dev.json --use-dev-igc"; \
GITHUB_TOKEN=$(cat /run/secrets/github_token) /install_drivers.sh $install_driver_opt --all
GITHUB_TOKEN=$(cat /run/secrets/github_token) /install_drivers.sh $install_driver_opt --igfx --cpu

COPY scripts/drivers_entrypoint.sh /drivers_entrypoint.sh

Expand Down
4 changes: 2 additions & 2 deletions devops/scripts/install_drivers.sh
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,9 @@ InstallIGFX () {
| grep -v "u18" \
| wget -qi -
get_release oneapi-src/level-zero $L0_TAG \
| grep ".*$UBUNTU_VER.*deb" \
| grep ".*$UBUNTU_VER.*deb$" \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we need to add the ddeb check here too?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, actually compute runtime is the only dependency containing debug packages.

| wget -qi -
dpkg -i --force-all *.deb && rm *.deb *.sum
dpkg -i --force-all *.deb && rm *.deb *.ddeb *.sum
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i wonder if we can instead change the get_release call to be something like grep ".*$UBUNTU_VER.*\.deb$"
so we dont ever download .ddeb

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought about it. If we don't need debug packages, I'll update this a bit later

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ive never seen a case where we actually get a crash with a stack trace that it would be useful to have symbols for, so i dont think we need them

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

a5b3108 updated. Also removed sum week check, as 2024 is already far away:)

mkdir -p /usr/local/lib/igc/
echo "$IGC_TAG" > /usr/local/lib/igc/IGCTAG.txt
if [ "$IS_IGC_DEV" == "Yes" ]; then
Expand Down
Loading