Merge pull request #2 from e3m3/mlir-sys-upgrade

Upgrade mlii-sys and rust toolchain versions

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "mlir"
-version = "0.3.34" # major-minor versions to match mlir_sys
-edition = "2021"
+version = "0.4.0" # major-minor versions to match mlir_sys
+edition = "2024"
 authors = ["Giordano Salvador <[email protected]>"]
 description = "Rust bindings over the MLIR C API bindings from mlir-sys"
 repository = "https://github.com/e3m3/mlir-rust"
@@ -10,11 +10,14 @@ license-file = "LICENSE"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
+[lib]
+crate-type = [ "cdylib", "rlib" ]
+
 [dependencies]
-num_cpus = { version = "1.16.0" }
-mlir-sys = { version = "=0.3.0" }
+mlir-sys = { version = "0.4.1", tag = "v0.4.1.2" , git = "https://github.com/e3m3/mlir-sys.git" }
 
 [dev-dependencies]
+num_cpus = { version = "1.16.0" }
 
 [workspace]
 members = [ "tests/lit-tests-rust" ]

config.toml

@@ -0,0 +1 @@
+[env]

container/Containerfile.fedora41

@@ -28,7 +28,8 @@ RUN dnf install -y \
     python3-lit
 RUN dnf clean -y all
 
-ENV RUST_CHANNEL=stable
+ENV RUST_CHANNEL=nightly-2024-12-10
+ENV RUSTFLAGS=''
 
 RUN rustup-init -y
 RUN source ${CARGO_ENV}  &&  rustup toolchain install ${RUST_CHANNEL}
@@ -38,6 +39,7 @@ RUN mkdir -p ${PROJECT_DIR}
 RUN mkdir -p ${PROJECT_DIR}/src
 
 COPY Cargo.toml             ${PROJECT_DIR}/
+COPY config.toml            ${PROJECT_DIR}/
 COPY rust-toolchain.toml    ${PROJECT_DIR}/
 COPY LICENSE                ${PROJECT_DIR}/
 COPY README.md              ${PROJECT_DIR}/
@@ -47,6 +49,14 @@ COPY tests                  ${PROJECT_DIR}/tests/
 ARG BUILD_MODE=
 
 WORKDIR ${PROJECT_DIR}
+
+RUN echo RUSTUP_TOOLCHAIN_PATH="$(rustup toolchain list | grep default | awk '{print $1}')" \
+    >> config.toml
+RUN echo RUST_SRC_PATH="${RUSTUP_TOOLCHAIN_PATH}/lib/rustlib/src/rust/src" \
+    >> config.toml
+RUN echo DYLD_LIBRARY_PATH="${RUSTUP_TOOLCHAIN_PATH}/lib:${DYLD_LIBRARY_PATH}" \
+    >> config.toml
+
 RUN source ${CARGO_ENV}  &&  cargo build --verbose ${BUILD_MODE}
-RUN source ${CARGO_ENV}  &&  cargo clippy --verbose
+RUN source ${CARGO_ENV}  &&  cargo clippy --verbose ${BUILD_MODE}
 RUN source ${CARGO_ENV}  &&  cargo test --verbose ${BUILD_MODE} -- --nocapture

rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "stable"
+channel = "nightly-2024-12-10"

scripts/build-and-test-macos.sh

@@ -10,14 +10,21 @@ PYTHON_VER=3.12
 
 brew install python@${PYTHON_VER} llvm@${LLVM_VER} lit rustup
 
-RUSTUP_CHANNEL=stable
+RUSTUP_CHANNEL=nightly-2024-12-10
 RUSTUP_HOME=/root/.rustup
-RUSTUP_TOOLCHAIN=${RUSTUP_CHANNEL}-aarch64-apple-darwin
-PATH=${RUSTUP_HOME}/toolchains/${RUSTUP_TOOLCHAIN}/bin${PATH:+:$PATH}
-LD_LIBRARY_PATH=${RUSTUP_HOME}/toolchains/${RUSTUP_TOOLCHAIN}/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
 
+rustup toolchain install ${RUSTUP_CHANNEL}
+rustup override set ${RUSTUP_CHANNEL}
 rustup default ${RUSTUP_CHANNEL}
 
+RUSTFLAGS=''
+RUSTUP_TOOLCHAIN_PATH="$(rustup toolchain list | grep default | awk '{print $1}')"
+RUSTUP_TOOLCHAIN="$(basename ${RUSTUP_TOOLCHAIN_PATH})"
+RUST_SRC_PATH="${RUSTUP_TOOLCHAIN_PATH}/lib/rustlib/src/rust/src"
+DYLD_LIBRARY_PATH="${RUSTUP_TOOLCHAIN_PATH}/lib:${DYLD_LIBRARY_PATH}"
+PATH=${RUSTUP_HOME}/toolchains/${RUSTUP_TOOLCHAIN}/bin${PATH:+:$PATH}
+LD_LIBRARY_PATH=${RUSTUP_HOME}/toolchains/${RUSTUP_TOOLCHAIN}/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+
 LLVM_HOME=${HOMEBREW_HOME}/opt/llvm@${LLVM_VER}
 PATH=${LLVM_HOME}/bin${PATH:+:$PATH}
 LD_LIBRARY_PATH=${LLVM_HOME}/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
@@ -31,6 +38,9 @@ PATH=${PYTHON_VENV_PATH}/bin${PATH:+:$PATH}
 export HOMEBREW_HOME
 export LLVM_HOME
 export PYTHON_VENV_PATH
+export RUSTFLAGS
+export RUST_SRC_PATH
+export DYLD_LIBRARY_PATH
 
 case ${BUILD_MODE} in
     debug)      build_mode= ;;
@@ -39,4 +49,5 @@ case ${BUILD_MODE} in
 esac
 
 cargo build --verbose ${build_mode}
+cargo clippy --verbose ${build_mode}
 cargo test --verbose ${build_mode} -- --nocapture

src/attributes.rs

@@ -3,9 +3,7 @@
 
 #![allow(dead_code)]
 
-extern crate mlir_sys as mlir;
-
-use mlir::MlirAttribute;
+use mlir_sys::MlirAttribute;
 
 use std::cmp;
 

src/attributes/array.rs

@@ -3,13 +3,11 @@
 
 #![allow(dead_code)]
 
-extern crate mlir_sys as mlir;
-
-use mlir::mlirArrayAttrGet;
-use mlir::mlirArrayAttrGetElement;
-use mlir::mlirArrayAttrGetNumElements;
-use mlir::mlirArrayAttrGetTypeID;
-use mlir::MlirAttribute;
+use mlir_sys::mlirArrayAttrGet;
+use mlir_sys::mlirArrayAttrGetElement;
+use mlir_sys::mlirArrayAttrGetNumElements;
+use mlir_sys::mlirArrayAttrGetTypeID;
+use mlir_sys::MlirAttribute;
 
 use crate::attributes;
 use crate::do_unsafe;

src/attributes/bool.rs

@@ -3,11 +3,9 @@
 
 #![allow(dead_code)]
 
-extern crate mlir_sys as mlir;
-
-use mlir::mlirBoolAttrGet;
-use mlir::mlirBoolAttrGetValue;
-use mlir::MlirAttribute;
+use mlir_sys::mlirBoolAttrGet;
+use mlir_sys::mlirBoolAttrGetValue;
+use mlir_sys::MlirAttribute;
 
 use std::ffi::c_int;
 

src/attributes/dense_array.rs

@@ -3,25 +3,23 @@
 
 #![allow(dead_code)]
 
-extern crate mlir_sys as mlir;
-
-use mlir::mlirDenseArrayGetNumElements;
-use mlir::mlirDenseBoolArrayGet;
-use mlir::mlirDenseBoolArrayGetElement;
-use mlir::mlirDenseF32ArrayGet;
-use mlir::mlirDenseF32ArrayGetElement;
-use mlir::mlirDenseF64ArrayGet;
-use mlir::mlirDenseF64ArrayGetElement;
-use mlir::mlirDenseI8ArrayGet;
-use mlir::mlirDenseI8ArrayGetElement;
-use mlir::mlirDenseI16ArrayGet;
-use mlir::mlirDenseI16ArrayGetElement;
-use mlir::mlirDenseI32ArrayGet;
-use mlir::mlirDenseI32ArrayGetElement;
-use mlir::mlirDenseI64ArrayGet;
-use mlir::mlirDenseI64ArrayGetElement;
-use mlir::mlirDenseArrayAttrGetTypeID;
-use mlir::MlirAttribute;
+use mlir_sys::mlirDenseArrayGetNumElements;
+use mlir_sys::mlirDenseBoolArrayGet;
+use mlir_sys::mlirDenseBoolArrayGetElement;
+use mlir_sys::mlirDenseF32ArrayGet;
+use mlir_sys::mlirDenseF32ArrayGetElement;
+use mlir_sys::mlirDenseF64ArrayGet;
+use mlir_sys::mlirDenseF64ArrayGetElement;
+use mlir_sys::mlirDenseI8ArrayGet;
+use mlir_sys::mlirDenseI8ArrayGetElement;
+use mlir_sys::mlirDenseI16ArrayGet;
+use mlir_sys::mlirDenseI16ArrayGetElement;
+use mlir_sys::mlirDenseI32ArrayGet;
+use mlir_sys::mlirDenseI32ArrayGetElement;
+use mlir_sys::mlirDenseI64ArrayGet;
+use mlir_sys::mlirDenseI64ArrayGetElement;
+use mlir_sys::mlirDenseArrayAttrGetTypeID;
+use mlir_sys::MlirAttribute;
 
 use std::ffi::c_int;
 use std::fmt;

src/attributes/dense_elements.rs

@@ -3,63 +3,61 @@
 
 #![allow(dead_code)]
 
-extern crate mlir_sys as mlir;
-
-use mlir::mlirDenseElementsAttrBoolGet;
-use mlir::mlirDenseElementsAttrGetBoolValue;
-use mlir::mlirDenseElementsAttrBoolSplatGet;
-use mlir::mlirDenseElementsAttrGetBoolSplatValue;
-use mlir::mlirDenseElementsAttrBFloat16Get;
-use mlir::mlirDenseElementsAttrDoubleGet;
-use mlir::mlirDenseElementsAttrGetDoubleValue;
-use mlir::mlirDenseElementsAttrDoubleSplatGet;
-use mlir::mlirDenseElementsAttrGetDoubleSplatValue;
-use mlir::mlirDenseElementsAttrFloat16Get;
-use mlir::mlirDenseElementsAttrFloatGet;
-use mlir::mlirDenseElementsAttrGetFloatValue;
-use mlir::mlirDenseElementsAttrFloatSplatGet;
-use mlir::mlirDenseElementsAttrGetFloatSplatValue;
-use mlir::mlirDenseElementsAttrInt8Get;
-use mlir::mlirDenseElementsAttrGetInt8Value;
-use mlir::mlirDenseElementsAttrInt8SplatGet;
-use mlir::mlirDenseElementsAttrGetInt8SplatValue;
-use mlir::mlirDenseElementsAttrInt16Get;
-use mlir::mlirDenseElementsAttrGetInt16Value;
-use mlir::mlirDenseElementsAttrInt32Get;
-use mlir::mlirDenseElementsAttrGetInt32Value;
-use mlir::mlirDenseElementsAttrInt32SplatGet;
-use mlir::mlirDenseElementsAttrGetInt32SplatValue;
-use mlir::mlirDenseElementsAttrInt64Get;
-use mlir::mlirDenseElementsAttrGetInt64Value;
-use mlir::mlirDenseElementsAttrInt64SplatGet;
-use mlir::mlirDenseElementsAttrGetInt64SplatValue;
-use mlir::mlirDenseElementsAttrStringGet;
-use mlir::mlirDenseElementsAttrGetStringValue;
-use mlir::mlirDenseElementsAttrGetStringSplatValue;
-use mlir::mlirDenseElementsAttrUInt8Get;
-use mlir::mlirDenseElementsAttrGetUInt8Value;
-use mlir::mlirDenseElementsAttrUInt8SplatGet;
-use mlir::mlirDenseElementsAttrGetUInt8SplatValue;
-use mlir::mlirDenseElementsAttrUInt16Get;
-use mlir::mlirDenseElementsAttrGetUInt16Value;
-use mlir::mlirDenseElementsAttrUInt32Get;
-use mlir::mlirDenseElementsAttrGetUInt32Value;
-use mlir::mlirDenseElementsAttrUInt32SplatGet;
-use mlir::mlirDenseElementsAttrGetUInt32SplatValue;
-use mlir::mlirDenseElementsAttrUInt64Get;
-use mlir::mlirDenseElementsAttrGetUInt64Value;
-use mlir::mlirDenseElementsAttrUInt64SplatGet;
-use mlir::mlirDenseElementsAttrGetUInt64SplatValue;
-use mlir::mlirDenseElementsAttrGet;
-use mlir::mlirDenseElementsAttrGetRawData;
-use mlir::mlirDenseElementsAttrIsSplat;
-use mlir::mlirDenseElementsAttrRawBufferGet;
-use mlir::mlirDenseElementsAttrReshapeGet;
-use mlir::mlirDenseElementsAttrSplatGet;
-use mlir::mlirDenseElementsAttrGetSplatValue;
-use mlir::mlirDenseIntOrFPElementsAttrGetTypeID;
-use mlir::MlirAttribute;
-use mlir::MlirStringRef;
+use mlir_sys::mlirDenseElementsAttrBoolGet;
+use mlir_sys::mlirDenseElementsAttrGetBoolValue;
+use mlir_sys::mlirDenseElementsAttrBoolSplatGet;
+use mlir_sys::mlirDenseElementsAttrGetBoolSplatValue;
+use mlir_sys::mlirDenseElementsAttrBFloat16Get;
+use mlir_sys::mlirDenseElementsAttrDoubleGet;
+use mlir_sys::mlirDenseElementsAttrGetDoubleValue;
+use mlir_sys::mlirDenseElementsAttrDoubleSplatGet;
+use mlir_sys::mlirDenseElementsAttrGetDoubleSplatValue;
+use mlir_sys::mlirDenseElementsAttrFloat16Get;
+use mlir_sys::mlirDenseElementsAttrFloatGet;
+use mlir_sys::mlirDenseElementsAttrGetFloatValue;
+use mlir_sys::mlirDenseElementsAttrFloatSplatGet;
+use mlir_sys::mlirDenseElementsAttrGetFloatSplatValue;
+use mlir_sys::mlirDenseElementsAttrInt8Get;
+use mlir_sys::mlirDenseElementsAttrGetInt8Value;
+use mlir_sys::mlirDenseElementsAttrInt8SplatGet;
+use mlir_sys::mlirDenseElementsAttrGetInt8SplatValue;
+use mlir_sys::mlirDenseElementsAttrInt16Get;
+use mlir_sys::mlirDenseElementsAttrGetInt16Value;
+use mlir_sys::mlirDenseElementsAttrInt32Get;
+use mlir_sys::mlirDenseElementsAttrGetInt32Value;
+use mlir_sys::mlirDenseElementsAttrInt32SplatGet;
+use mlir_sys::mlirDenseElementsAttrGetInt32SplatValue;
+use mlir_sys::mlirDenseElementsAttrInt64Get;
+use mlir_sys::mlirDenseElementsAttrGetInt64Value;
+use mlir_sys::mlirDenseElementsAttrInt64SplatGet;
+use mlir_sys::mlirDenseElementsAttrGetInt64SplatValue;
+use mlir_sys::mlirDenseElementsAttrStringGet;
+use mlir_sys::mlirDenseElementsAttrGetStringValue;
+use mlir_sys::mlirDenseElementsAttrGetStringSplatValue;
+use mlir_sys::mlirDenseElementsAttrUInt8Get;
+use mlir_sys::mlirDenseElementsAttrGetUInt8Value;
+use mlir_sys::mlirDenseElementsAttrUInt8SplatGet;
+use mlir_sys::mlirDenseElementsAttrGetUInt8SplatValue;
+use mlir_sys::mlirDenseElementsAttrUInt16Get;
+use mlir_sys::mlirDenseElementsAttrGetUInt16Value;
+use mlir_sys::mlirDenseElementsAttrUInt32Get;
+use mlir_sys::mlirDenseElementsAttrGetUInt32Value;
+use mlir_sys::mlirDenseElementsAttrUInt32SplatGet;
+use mlir_sys::mlirDenseElementsAttrGetUInt32SplatValue;
+use mlir_sys::mlirDenseElementsAttrUInt64Get;
+use mlir_sys::mlirDenseElementsAttrGetUInt64Value;
+use mlir_sys::mlirDenseElementsAttrUInt64SplatGet;
+use mlir_sys::mlirDenseElementsAttrGetUInt64SplatValue;
+use mlir_sys::mlirDenseElementsAttrGet;
+use mlir_sys::mlirDenseElementsAttrGetRawData;
+use mlir_sys::mlirDenseElementsAttrIsSplat;
+use mlir_sys::mlirDenseElementsAttrRawBufferGet;
+use mlir_sys::mlirDenseElementsAttrReshapeGet;
+use mlir_sys::mlirDenseElementsAttrSplatGet;
+use mlir_sys::mlirDenseElementsAttrGetSplatValue;
+use mlir_sys::mlirDenseIntOrFPElementsAttrGetTypeID;
+use mlir_sys::MlirAttribute;
+use mlir_sys::MlirStringRef;
 
 use std::ffi::c_int;
 use std::ffi::c_void;

src/attributes/dense_resource_elements.rs

@@ -3,32 +3,30 @@
 
 #![allow(dead_code)]
 
-extern crate mlir_sys as mlir;
-
-use mlir::mlirUnmanagedDenseBoolResourceElementsAttrGet;
-use mlir::mlirDenseBoolResourceElementsAttrGetValue;
-use mlir::mlirUnmanagedDenseDoubleResourceElementsAttrGet;
-use mlir::mlirDenseDoubleResourceElementsAttrGetValue;
-use mlir::mlirUnmanagedDenseFloatResourceElementsAttrGet;
-use mlir::mlirDenseFloatResourceElementsAttrGetValue;
-use mlir::mlirUnmanagedDenseInt8ResourceElementsAttrGet;
-use mlir::mlirDenseInt8ResourceElementsAttrGetValue;
-use mlir::mlirUnmanagedDenseInt16ResourceElementsAttrGet;
-use mlir::mlirDenseInt16ResourceElementsAttrGetValue;
-use mlir::mlirUnmanagedDenseInt32ResourceElementsAttrGet;
-use mlir::mlirDenseInt32ResourceElementsAttrGetValue;
-use mlir::mlirUnmanagedDenseInt64ResourceElementsAttrGet;
-use mlir::mlirDenseInt64ResourceElementsAttrGetValue;
-use mlir::mlirUnmanagedDenseUInt8ResourceElementsAttrGet;
-use mlir::mlirDenseUInt8ResourceElementsAttrGetValue;
-use mlir::mlirUnmanagedDenseUInt16ResourceElementsAttrGet;
-use mlir::mlirDenseUInt16ResourceElementsAttrGetValue;
-use mlir::mlirUnmanagedDenseUInt32ResourceElementsAttrGet;
-use mlir::mlirDenseUInt32ResourceElementsAttrGetValue;
-use mlir::mlirUnmanagedDenseUInt64ResourceElementsAttrGet;
-use mlir::mlirDenseUInt64ResourceElementsAttrGetValue;
-use mlir::mlirUnmanagedDenseResourceElementsAttrGet;
-use mlir::MlirAttribute;
+use mlir_sys::mlirUnmanagedDenseBoolResourceElementsAttrGet;
+use mlir_sys::mlirDenseBoolResourceElementsAttrGetValue;
+use mlir_sys::mlirUnmanagedDenseDoubleResourceElementsAttrGet;
+use mlir_sys::mlirDenseDoubleResourceElementsAttrGetValue;
+use mlir_sys::mlirUnmanagedDenseFloatResourceElementsAttrGet;
+use mlir_sys::mlirDenseFloatResourceElementsAttrGetValue;
+use mlir_sys::mlirUnmanagedDenseInt8ResourceElementsAttrGet;
+use mlir_sys::mlirDenseInt8ResourceElementsAttrGetValue;
+use mlir_sys::mlirUnmanagedDenseInt16ResourceElementsAttrGet;
+use mlir_sys::mlirDenseInt16ResourceElementsAttrGetValue;
+use mlir_sys::mlirUnmanagedDenseInt32ResourceElementsAttrGet;
+use mlir_sys::mlirDenseInt32ResourceElementsAttrGetValue;
+use mlir_sys::mlirUnmanagedDenseInt64ResourceElementsAttrGet;
+use mlir_sys::mlirDenseInt64ResourceElementsAttrGetValue;
+use mlir_sys::mlirUnmanagedDenseUInt8ResourceElementsAttrGet;
+use mlir_sys::mlirDenseUInt8ResourceElementsAttrGetValue;
+use mlir_sys::mlirUnmanagedDenseUInt16ResourceElementsAttrGet;
+use mlir_sys::mlirDenseUInt16ResourceElementsAttrGetValue;
+use mlir_sys::mlirUnmanagedDenseUInt32ResourceElementsAttrGet;
+use mlir_sys::mlirDenseUInt32ResourceElementsAttrGetValue;
+use mlir_sys::mlirUnmanagedDenseUInt64ResourceElementsAttrGet;
+use mlir_sys::mlirDenseUInt64ResourceElementsAttrGetValue;
+use mlir_sys::mlirUnmanagedDenseResourceElementsAttrGet;
+use mlir_sys::MlirAttribute;
 
 use std::ffi::c_int;
 use std::ffi::c_void;

src/attributes/dictionary.rs

@@ -3,15 +3,13 @@
 
 #![allow(dead_code)]
 
-extern crate mlir_sys as mlir;
-
-use mlir::mlirDictionaryAttrGet;
-use mlir::mlirDictionaryAttrGetElement;
-use mlir::mlirDictionaryAttrGetElementByName;
-use mlir::mlirDictionaryAttrGetNumElements;
-use mlir::mlirDictionaryAttrGetTypeID;
-use mlir::MlirAttribute;
-use mlir::MlirNamedAttribute;
+use mlir_sys::mlirDictionaryAttrGet;
+use mlir_sys::mlirDictionaryAttrGetElement;
+use mlir_sys::mlirDictionaryAttrGetElementByName;
+use mlir_sys::mlirDictionaryAttrGetNumElements;
+use mlir_sys::mlirDictionaryAttrGetTypeID;
+use mlir_sys::MlirAttribute;
+use mlir_sys::MlirNamedAttribute;
 
 use crate::attributes;
 use crate::do_unsafe;