Skip to content

[HotFix] Env Var set conflicts between #2543 and #2514 #2571

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 30, 2023
Merged

[HotFix] Env Var set conflicts between #2543 and #2514 #2571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
12483e6
Fix conflicts between #2543 and #2514
junliume Nov 30, 2023
e2345fe
minor fix
junliume Nov 30, 2023
6ff61ba
revise Jenkins setting
junliume Nov 30, 2023
676424a
minor fix
junliume Nov 30, 2023
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
2 changes: 1 addition & 1 deletion Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
def rocmnode(name) {
return 'rocmtest && miopen && (' + name + ')'
return '(rocmtest || miopen) && (' + name + ')'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@junliume @reidkwja May I ask why this change is necessary? The latest labeling convention I am aware of is:

  • Each node that allowed for use in CI is marked with "rocmtest"
  • The nodes that allowed for use by MIOpen are marked with "miopen"

That is, only nodes that have both "rocmtest" and "miopen" are enabled for MIOpen CI.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@atamazov I was under the same impression as you but @pfultz2 informed us that rocmtest means shared nodes. So if we have MIOpen specific nodes we should not have rocmtest label on it.

Copy link
Contributor

@atamazov atamazov Dec 7, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@junliume @pfultz2 So the new convention is:

  • The CI nodes marked with "rocmtest" are allowed to be used in any project
  • The CI nodes marked with "miopen" are only allowed for use by MIOpen
  • ⚠️ From now on, setting both "rocmtest" and "miopen" labels is pointless; all such cases should be revised.

Am I right?

}

def miopenCheckout()
Expand Down
10 changes: 7 additions & 3 deletions test/gtest/sum.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,20 @@
* SOFTWARE.
*
*******************************************************************************/
#include <miopen/env.hpp>
#include "sum.hpp"

MIOPEN_DECLARE_ENV_VAR_STR(MIOPEN_TEST_FLOAT_ARG)
MIOPEN_DECLARE_ENV_VAR_BOOL(MIOPEN_TEST_ALL)

std::string GetFloatArg()
{
static const auto tmp = miopen::GetEnv("MIOPEN_TEST_FLOAT_ARG");
const auto& tmp = miopen::GetStringEnv(ENV(MIOPEN_TEST_FLOAT_ARG));
if(tmp.empty())
{
return "";
}
return tmp.front();
return tmp;
}

struct SumTestFloat : SumTest<float>
Expand All @@ -41,7 +45,7 @@ struct SumTestFloat : SumTest<float>

TEST_P(SumTestFloat, SumTestFw)
{
if(miopen::IsEnvvarValueEnabled("MIOPEN_TEST_ALL") && (GetFloatArg() == "--float"))
if(miopen::IsEnabled(ENV(MIOPEN_TEST_ALL)) && (GetFloatArg() == "--float"))
{
RunTest();
Verify();
Expand Down