Add support for using a custom target under linux Fixes #18 #78
Conversation
| @@ -2,10 +2,11 @@ | |||
|
|
|||
| use crate::{check::*, error::*}; | |||
| use std::{ | |||
| fs, | |||
| fmt, fs, | |||
|
|
||
| fn from_str(s: &str) -> Result<Self, Self::Err> { | ||
| let target = match s.to_ascii_lowercase().as_str() { | ||
| "p2" => Self::P2, |
There was a problem hiding this comment.
Can you please also split it into sections with titles just like in the enum? To keep things synced.
|
|
||
| impl fmt::Display for ParseTargetError { | ||
| fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { | ||
| "provided string was not a valid target".fmt(f) |
There was a problem hiding this comment.
Deviates from the other error messages. Maybe “The target is not supported.”?
| } | ||
| } | ||
|
|
||
| #[derive(Debug, Clone, PartialEq, Eq, Default)] |
| pub struct ParseTargetError; | ||
|
|
||
| impl fmt::Display for ParseTargetError { | ||
| fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { |
| impl FromStr for Target { | ||
| type Err = ParseTargetError; | ||
|
|
||
| fn from_str(s: &str) -> Result<Self, Self::Err> { |
There was a problem hiding this comment.
Please call it string or value.
| @@ -116,6 +117,99 @@ pub enum Target { | |||
| Z14, | |||
| } | |||
|
|
|||
| impl FromStr for Target { | |||
There was a problem hiding this comment.
I would probably generate both the enum and this impl via a macro to avoid repetition. But if cumbersome, let’s keep it as is.
| @@ -104,6 +104,10 @@ fn build() { | |||
| } else { | |||
| cfg.no_static = true; | |||
| } | |||
| cfg.target = match env::var("OPENBLAS_TARGET") { | |||
| Ok(target) => target.parse().ok(), | |||
There was a problem hiding this comment.
Given that the error is ignored, I propose to remove ParseTargetError all together. Just use some existing struct to satisfy the trait.
There was a problem hiding this comment.
ParseTargetError is merged in openblas_build::error::Error::UnsupportedTarget cee2fd0
| cfg.target = match env::var("OPENBLAS_TARGET") { | ||
| Ok(target) => target.parse().ok(), | ||
| _ => None, | ||
| }; |
There was a problem hiding this comment.
I change here in e25b20f to immediately panic when $OPENBLAS_TARGET is invalid.
|
Manually trigger CI for additional commit |
This allows the requested target to be specified by the environment variable
OPENBLAS_TARGETunder linux. This fixes #18