Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
9 changes: 0 additions & 9 deletions .ci/docker/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,6 @@ case "${IMAGE_NAME}" in
# From https://developer.android.com/ndk/downloads
ANDROID_NDK_VERSION=r28c
;;
executorch-ubuntu-22.04-cuda-windows)
LINTRUNNER=""
GCC_VERSION=11
CUDA_WINDOWS_CROSS_COMPILE=yes
CUDA_VERSION=12.8
SKIP_PYTORCH=yes
;;
*)
echo "Invalid image name ${IMAGE_NAME}"
exit 1
Expand Down Expand Up @@ -108,8 +101,6 @@ docker build \
--build-arg "MEDIATEK_SDK=${MEDIATEK_SDK:-}" \
--build-arg "ANDROID_NDK_VERSION=${ANDROID_NDK_VERSION:-}" \
--build-arg "SKIP_PYTORCH=${SKIP_PYTORCH:-}" \
--build-arg "CUDA_WINDOWS_CROSS_COMPILE=${CUDA_WINDOWS_CROSS_COMPILE:-}" \
--build-arg "CUDA_VERSION=${CUDA_VERSION:-}" \
-f "${OS}"/Dockerfile \
"$@" \
.
57 changes: 0 additions & 57 deletions .ci/docker/common/install_cuda.sh

This file was deleted.

149 changes: 0 additions & 149 deletions .ci/docker/common/install_cuda_windows_cross_compile.sh

This file was deleted.

18 changes: 0 additions & 18 deletions .ci/docker/ubuntu/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -98,23 +98,5 @@ ARG QNN_SDK

ARG MEDIATEK_SDK

ARG CUDA_WINDOWS_CROSS_COMPILE
ARG CUDA_VERSION
COPY ./common/install_cuda.sh install_cuda.sh
COPY ./common/install_cuda_windows_cross_compile.sh install_cuda_windows_cross_compile.sh
COPY ./common/utils.sh utils.sh
RUN if [ -n "${CUDA_WINDOWS_CROSS_COMPILE}" ]; then \
CUDA_VERSION=${CUDA_VERSION} bash ./install_cuda.sh && \
bash ./install_cuda_windows_cross_compile.sh; \
fi
RUN rm -f install_cuda.sh install_cuda_windows_cross_compile.sh utils.sh
# Set up CUDA environment for Linux compilation (nvcc, etc.)
ENV CUDA_HOME=/usr/local/cuda
ENV PATH=${CUDA_HOME}/bin:${PATH}
# Ensure system libstdc++ is found before conda's (GLIBCXX_3.4.30 compatibility)
ENV LD_LIBRARY_PATH=/usr/lib/x86_64-linux-gnu:${CUDA_HOME}/lib64:${LD_LIBRARY_PATH}
# Windows CUDA for cross-compilation
ENV WINDOWS_CUDA_HOME=/opt/cuda-windows/extracted/cuda_cudart/cudart

USER ci-user
CMD ["bash"]
17 changes: 4 additions & 13 deletions .ci/scripts/export_model_artifact.sh
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,11 @@ OUTPUT_DIR="${4:-.}"
case "$DEVICE" in
cuda)
;;
cuda-windows)
;;
metal)
;;
*)
echo "Error: Unsupported device '$DEVICE'"
echo "Supported devices: cuda, cuda-windows, metal"
echo "Supported devices: cuda, metal"
exit 1
;;
esac
Expand Down Expand Up @@ -149,7 +147,7 @@ if [ -n "$MAX_SEQ_LEN" ]; then
fi

DEVICE_ARG=""
if [ "$DEVICE" = "cuda" ] || [ "$DEVICE" = "cuda-windows" ]; then
if [ "$DEVICE" = "cuda" ]; then
DEVICE_ARG="--device cuda"
fi

Expand All @@ -171,15 +169,8 @@ if [ -n "$PREPROCESSOR_OUTPUT" ]; then
--output_file $PREPROCESSOR_OUTPUT
fi

# Determine blob file name - cuda and cuda-windows both use aoti_cuda_blob.ptd
if [ "$DEVICE" = "cuda" ] || [ "$DEVICE" = "cuda-windows" ]; then
BLOB_FILE="aoti_cuda_blob.ptd"
else
BLOB_FILE="aoti_${DEVICE}_blob.ptd"
fi

test -f model.pte
test -f $BLOB_FILE
test -f aoti_${DEVICE}_blob.ptd
if [ -n "$PREPROCESSOR_OUTPUT" ]; then
test -f $PREPROCESSOR_OUTPUT
fi
Expand All @@ -188,7 +179,7 @@ echo "::endgroup::"
echo "::group::Store $MODEL_NAME Artifacts"
mkdir -p "${OUTPUT_DIR}"
mv model.pte "${OUTPUT_DIR}/"
mv $BLOB_FILE "${OUTPUT_DIR}/"
mv aoti_${DEVICE}_blob.ptd "${OUTPUT_DIR}/"
if [ -n "$PREPROCESSOR_OUTPUT" ]; then
mv $PREPROCESSOR_OUTPUT "${OUTPUT_DIR}/"
fi
Expand Down
91 changes: 0 additions & 91 deletions .github/workflows/cuda-windows.yml

This file was deleted.

Loading
Loading