Merge branch 'export-D77248983' of https://github.com/JacobSzwejbka/executorch-1 into pr/11929

Author: JacobSzwejbka

.Package.swift/kernels_custom/dummy.swift .Package.swift/kernels_llm/dummy.swift.Package.swift/kernels_custom/dummy.swift renamed to .Package.swift/kernels_llm/dummy.swift

@@ -0,0 +1 @@
+a3942627f5ac048e06b4b1d703b0a6a53bf6da5b

…e.swift/kernels_custom_debug/dummy.swift …kage.swift/kernels_llm_debug/dummy.swift.Package.swift/kernels_custom_debug/dummy.swift renamed to .Package.swift/kernels_llm_debug/dummy.swift .Package.swift/kernels_custom_debug/dummy.swift renamed to .Package.swift/kernels_llm_debug/dummy.swift

@@ -1 +1 @@
-5616fa4a68718ead203314a3467f7dd9547153ae
+7cda4017ddda554752e89069ae205be5e8388f59

.ci/docker/ci_commit_pins/optimum-executorch.txt

@@ -13,7 +13,7 @@ source "$(dirname "${BASH_SOURCE[0]}")/utils.sh"
 install_miniconda() {
   BASE_URL="https://repo.anaconda.com/miniconda"
   CONDA_FILE="Miniconda3-py${PYTHON_VERSION//./}_${MINICONDA_VERSION}-Linux-x86_64.sh"
-  if [[ $(uname -m) == "aarch64" ]]; then 
+  if [[ $(uname -m) == "aarch64" ]]; then
     CONDA_FILE="Miniconda3-py${PYTHON_VERSION//./}_${MINICONDA_VERSION}-Linux-aarch64.sh"
   fi
 
@@ -71,4 +71,8 @@ fix_conda_ubuntu_libstdcxx() {
 install_miniconda
 install_python
 install_pip_dependencies
-fix_conda_ubuntu_libstdcxx
+# Hack breaks the job on aarch64 but is still necessary everywhere
+# else.
+if [ "$(uname -m)" != "aarch64" ]; then
+    fix_conda_ubuntu_libstdcxx
+fi

.ci/docker/ci_commit_pins/pytorch.txt

@@ -1,4 +1,4 @@
-cmake=3.26.4
+cmake=3.31.2
 ninja=1.10.2
 libuv
 llvm-openmp

.ci/docker/common/install_conda.sh

@@ -77,16 +77,16 @@ python3 .ci/scripts/benchmark_tooling/analyze_benchmark_stability.py \
 
 ##### Filtering Options:
 
-- `--device-pools`: Filter by private device pool names (e.g., "samsung-galaxy-s22-5g", "samsung-galaxy-s22plus-5g")
+- `--device-pools`: Filter by device pool names (e.g., "apple_iphone_15_private", "samsung_s22_private")
 - `--backends`: Filter by specific backend names (e.g.,"xnnpack_q8")
-- `--models`: Filter by specific model names (e.g., "mv3", "meta-llama-llama-3.2-1b-instruct-qlora-int4-eo8")
+- `--models`: Filter by specific model names (e.g., "mv3", "meta-llama/Llama-3.2-1B-Instruct-SpinQuant_INT4_EO8")
 
 #### Example Usage
 
 Filter by multiple private device pools and models:
 ```bash
 # This fetches all private table data for models 'llama-3.2-1B' and 'mv3'
-python3 get_benchmark_analysis_data.py \
+python3 .ci/scripts/benchmark_tooling/get_benchmark_analysis_data.py \
   --startTime "2025-06-01T00:00:00" \
   --endTime "2025-06-11T00:00:00" \
   --device-pools 'apple_iphone_15_private' 'samsung_s22_private' \
@@ -97,7 +97,7 @@ Filter by specific device pool and models:
 ```bash
 # This fetches all private iPhone table data for models 'llama-3.2-1B' and 'mv3',
 # and associated public iPhone data
-python3 get_benchmark_analysis_data.py \
+python3 .ci/scripts/benchmark_tooling/get_benchmark_analysis_data.py \
   --startTime "2025-06-01T00:00:00" \
   --endTime "2025-06-11T00:00:00" \
   --device-pools 'apple_iphone_15_private' \
@@ -140,22 +140,6 @@ fetcher.run(
     end_time="2025-06-17T18:00:00"
 )
 
-# Get results in different formats
-# As DataFrames
-df_results = fetcher.to_df()
-
-# Export to Excel
-fetcher.to_excel(output_dir="./results")
-
-# Export to CSV
-fetcher.to_csv(output_dir="./results")
-
-# Export to JSON
-json_path = fetcher.to_json(output_dir="./results")
-
-# Get raw dictionary results
-dict_results = fetcher.to_dict()
-
 # Use the output_data method for flexible output
 results = fetcher.output_data(output_type="excel", output_dir="./results")
 ```