From 772900e731ba379de0bbbc89e5634ef9390d96e5 Mon Sep 17 00:00:00 2001 From: Toshiki Teramura Date: Sat, 13 Aug 2022 15:49:17 +0900 Subject: [PATCH] Drop intel-mkl-pack --- .github/workflows/intel-mkl-pack.yml | 19 ------- Cargo.toml | 1 - intel-mkl-pack/Cargo.toml | 15 ----- intel-mkl-pack/src/main.rs | 85 ---------------------------- 4 files changed, 120 deletions(-) delete mode 100644 .github/workflows/intel-mkl-pack.yml delete mode 100644 intel-mkl-pack/Cargo.toml delete mode 100644 intel-mkl-pack/src/main.rs diff --git a/.github/workflows/intel-mkl-pack.yml b/.github/workflows/intel-mkl-pack.yml deleted file mode 100644 index da98723b..00000000 --- a/.github/workflows/intel-mkl-pack.yml +++ /dev/null @@ -1,19 +0,0 @@ -name: intel-mkl-pack - -on: - push: - branches: - - master - pull_request: {} - -jobs: - linux: - runs-on: ubuntu-22.04 - container: - image: ghcr.io/rust-math/rust-mkl:1.62.1-2020.1 - steps: - - uses: actions/checkout@v1 - - uses: actions-rs/cargo@v1 - with: - command: run - args: --manifest-path=intel-mkl-pack/Cargo.toml --release diff --git a/Cargo.toml b/Cargo.toml index f328d627..8cbf4614 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,5 +3,4 @@ members = [ "intel-mkl-src", "intel-mkl-sys", "intel-mkl-tool", - "intel-mkl-pack", ] diff --git a/intel-mkl-pack/Cargo.toml b/intel-mkl-pack/Cargo.toml deleted file mode 100644 index 0ec7366e..00000000 --- a/intel-mkl-pack/Cargo.toml +++ /dev/null @@ -1,15 +0,0 @@ -[package] -name = "intel-mkl-pack" -version = "0.1.0" -edition = "2021" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dependencies.intel-mkl-tool] -path = "../intel-mkl-tool" - -[dependencies] -anyhow = "1.0.60" -oci-spec = "0.5.7" -ocipkg = "0.1.2" -colored = "2.0.0" diff --git a/intel-mkl-pack/src/main.rs b/intel-mkl-pack/src/main.rs deleted file mode 100644 index c24ce7bf..00000000 --- a/intel-mkl-pack/src/main.rs +++ /dev/null @@ -1,85 +0,0 @@ -//! Create container of MKL library, found by intel-mkl-tool - -use anyhow::{bail, Result}; -use colored::Colorize; -use intel_mkl_tool::{Config, Library, LinkType, STATIC_EXTENSION}; -use oci_spec::image::Platform; -use ocipkg::{image::Builder, ImageName}; -use std::{fs, path::Path, time::Instant}; - -const REGISTRY: &str = "ghcr.io/rust-math/intel-mkl-src"; - -fn main() -> Result<()> { - let run_id: u64 = std::env::var("GITHUB_RUN_ID") - .unwrap_or_else(|_| "0".to_string()) // fallback value for local testing - .parse()?; - for cfg in Config::possibles() { - let lib = Library::new(cfg)?; - let (year, _, update) = lib.version()?; - let name = ImageName::parse(&format!( - "{}/{}:{}.{}-{}", - REGISTRY, cfg, year, update, run_id - ))?; - let output = format!("{}.tar", cfg); - - eprintln!("{:>12} {}", "Packaging".green().bold(), name); - let timer = Instant::now(); - pack(cfg, &name, &output)?; - eprintln!( - "{:>12} {} ({:.2}s)", - "Created".green().bold(), - output, - timer.elapsed().as_secs_f32() - ); - } - Ok(()) -} - -/// Create oci-archive -pub fn pack(cfg: Config, name: &ImageName, output: impl AsRef) -> Result<()> { - let lib = Library::new(cfg)?; - - let libs = cfg - .libs() - .into_iter() - .chain(cfg.additional_libs().into_iter()) - .map(|name| { - let path = if name == "iomp5" { - lib.iomp5_dir - .as_ref() - .unwrap() - .join(as_library_filename(cfg.link, &name)) - } else { - lib.library_dir.join(as_library_filename(cfg.link, &name)) - }; - if !path.exists() { - bail!("Required library not found: {}", path.display()); - } - Ok(path) - }) - .collect::>>()?; - - let mut f = fs::File::create(output)?; - let mut builder = Builder::new(&mut f); - builder.append_files(&libs)?; - builder.set_platform(&Platform::default()); - builder.set_name(name); - Ok(()) -} - -fn as_library_filename(link: LinkType, name: &str) -> String { - match link { - LinkType::Static => format!( - "{}{}.{}", - std::env::consts::DLL_PREFIX, - name, - STATIC_EXTENSION - ), - LinkType::Dynamic => format!( - "{}{}.{}", - std::env::consts::DLL_PREFIX, - name, - std::env::consts::DLL_EXTENSION - ), - } -}