From fb647b4b58e70e890778137ca5454e179aa65ebb Mon Sep 17 00:00:00 2001 From: Michael McKinsey Date: Mon, 5 Jan 2026 10:47:54 -0800 Subject: [PATCH 1/5] Set false default --- thicket/tests/conftest.py | 4 ++-- thicket/thicket.py | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/thicket/tests/conftest.py b/thicket/tests/conftest.py index 5c216dd0..8255a8d9 100644 --- a/thicket/tests/conftest.py +++ b/thicket/tests/conftest.py @@ -79,14 +79,14 @@ def stats_thicket_axis_columns( """ th_cuda128_1 = Thicket.from_caliperreader( rajaperf_cuda_block128_1M_cali[0:4], - node_ordering=True, + node_ordering=False, intersection=intersection, fill_perfdata=fill_perfdata, disable_tqdm=True, ) th_cuda128_2 = Thicket.from_caliperreader( rajaperf_cuda_block128_1M_cali[5:9], - node_ordering=True, + node_ordering=False, intersection=intersection, fill_perfdata=fill_perfdata, disable_tqdm=True, diff --git a/thicket/thicket.py b/thicket/thicket.py index c47e887c..e277de43 100644 --- a/thicket/thicket.py +++ b/thicket/thicket.py @@ -443,6 +443,7 @@ def from_caliperreader( intersection=False, fill_perfdata=True, disable_tqdm=False, + node_ordering=False, **kwargs, ): """Helper function to read one caliper file. @@ -453,6 +454,7 @@ def from_caliperreader( intersection (bool): whether to perform intersection or union (default) fill_perfdata (bool): whether to fill missing performance data with NaNs disable_tqdm (bool): whether to display tqdm progress bar + node_ordering (bool): whether to apply node ordering to the graph """ return Thicket.reader_dispatch( GraphFrame.from_caliperreader, @@ -460,6 +462,7 @@ def from_caliperreader( fill_perfdata, disable_tqdm, filename_or_caliperreader, + node_ordering=node_ordering, **kwargs, ) From a19d7a79fe4f0156e312f01f786e606a765428c8 Mon Sep 17 00:00:00 2001 From: Michael McKinsey Date: Mon, 5 Jan 2026 11:01:44 -0800 Subject: [PATCH 2/5] Set node ordering true for node ordering test --- thicket/tests/.DS_Store | Bin 0 -> 10244 bytes thicket/tests/data/.DS_Store | Bin 0 -> 6148 bytes thicket/tests/test_caliperreader.py | 2 ++ 3 files changed, 2 insertions(+) create mode 100644 thicket/tests/.DS_Store create mode 100644 thicket/tests/data/.DS_Store diff --git a/thicket/tests/.DS_Store b/thicket/tests/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..45035d68bc1b30366fe30f1094d064c4ff80fdfc GIT binary patch literal 10244 zcmeHMO>Yx15VhMtw@Om)K*wwg7DP13S?keRgr94!!l_fNmLcdcz zQ|9s~H()jJO0`uJ^+1IxI5XNka11yG90QI4$ADwtUtj=#v#EGxV_oYQa11yGCJfN| z;G>eQ<#uc=A022o1%NH#F&Ffa2QbFZZ7sKBV;KscCVS91ROcy%HgNpz({R{YZpX$N zxY7o$bpB?YXDFKA4xG=!m981PdigBAwR&+h$g0)v zdTzdS;o^d~;FY~sje~U5$eP)3P;d5M(6^^)8n;gR&DOIh90irthiQ^Eqa^GzAnJq| z^746hBm;K<33Cbew7PukDuP1gOc(NE$u*(U(%+JwCTymashR3E&icpiY=6i-4M zvzok0J)|ePhly1LJwkZvqb1+ew`in)PI9&AcRLYuKZLIgnp?ch(aPk! zmZrQ>oLO)jUtdIgT@tts-a5c)V$8#irZ|)6ia>|paex_jRSO>MY*PG5yyRdHZ;#nu z9~^Xf?ZhX?v287^jr4X^%%FlWlR>&J`0)^_#qUyEV!T;q?3crp+5T5v-zN1A$`cx zlVT>s$AV)9CC-Ct^v>A+9@b5c$06g2W56-s7;p?Y1{?$DfPs0lMxXBgAI<*%|2bg7 zEzvP>ei_iE-NtSm>p!``nx=y8+I`g5s8nd&*jR?3;p=!rXz|dr;JX2zlr{qQ%WA?>L|`tj7(l84&XPxX+uPG z5qT%zkHO9n@6ubUumTh<-lrDt${Mf69gNXh!Ar!5R>u(6TVr_osu_*IS1^a(eV~du%8Inqge*ys^5R)mBx*KP(;}%fH#8lxCwn7rdp;iw20Q+szqi=&=lgg1 zi0|H8EPC?Vja&C0kKX0uLVduTU;-&)G`yJ4q*Q{Yc4!0Uq#XACSh2KCZ`LLUKu9W-l0%s&at z@ht`x8-wV92}1=Ms<1~4Vd!Z0ZC+rpF=*%{?BPS$D+_x<5&G&F-`D9R0)wt}3OEH; z71%UYkN5wFKR^Gkl3dLx;1u|;6cC-m@NkGJ*}Zjba=h32@Kwvf7 cZMZh{`5XWPi;Y3Fz}%03mcbQHfxoK2cNHg}^#A|> literal 0 HcmV?d00001 diff --git a/thicket/tests/test_caliperreader.py b/thicket/tests/test_caliperreader.py index 747319cd..97cc7941 100644 --- a/thicket/tests/test_caliperreader.py +++ b/thicket/tests/test_caliperreader.py @@ -35,6 +35,7 @@ def test_node_ordering_from_caliper(caliper_ordered, intersection, fill_perfdata tk = Thicket.from_caliperreader( caliper_ordered[0], + node_ordering=True, intersection=intersection, fill_perfdata=fill_perfdata, disable_tqdm=True, @@ -103,6 +104,7 @@ def test_node_ordering_from_caliper(caliper_ordered, intersection, fill_perfdata # test node ordering True for multiple profiles tk_multi = Thicket.from_caliperreader( caliper_ordered, + node_ordering=True, intersection=intersection, fill_perfdata=fill_perfdata, disable_tqdm=True, From afc6b1b008bebc487f91f94e5413ec694ffd3d1e Mon Sep 17 00:00:00 2001 From: Michael McKinsey Date: Mon, 5 Jan 2026 11:05:57 -0800 Subject: [PATCH 3/5] rm files --- thicket/tests/.DS_Store | Bin 10244 -> 0 bytes thicket/tests/data/.DS_Store | Bin 6148 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 thicket/tests/.DS_Store delete mode 100644 thicket/tests/data/.DS_Store diff --git a/thicket/tests/.DS_Store b/thicket/tests/.DS_Store deleted file mode 100644 index 45035d68bc1b30366fe30f1094d064c4ff80fdfc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10244 zcmeHMO>Yx15VhMtw@Om)K*wwg7DP13S?keRgr94!!l_fNmLcdcz zQ|9s~H()jJO0`uJ^+1IxI5XNka11yG90QI4$ADwtUtj=#v#EGxV_oYQa11yGCJfN| z;G>eQ<#uc=A022o1%NH#F&Ffa2QbFZZ7sKBV;KscCVS91ROcy%HgNpz({R{YZpX$N zxY7o$bpB?YXDFKA4xG=!m981PdigBAwR&+h$g0)v zdTzdS;o^d~;FY~sje~U5$eP)3P;d5M(6^^)8n;gR&DOIh90irthiQ^Eqa^GzAnJq| z^746hBm;K<33Cbew7PukDuP1gOc(NE$u*(U(%+JwCTymashR3E&icpiY=6i-4M zvzok0J)|ePhly1LJwkZvqb1+ew`in)PI9&AcRLYuKZLIgnp?ch(aPk! zmZrQ>oLO)jUtdIgT@tts-a5c)V$8#irZ|)6ia>|paex_jRSO>MY*PG5yyRdHZ;#nu z9~^Xf?ZhX?v287^jr4X^%%FlWlR>&J`0)^_#qUyEV!T;q?3crp+5T5v-zN1A$`cx zlVT>s$AV)9CC-Ct^v>A+9@b5c$06g2W56-s7;p?Y1{?$DfPs0lMxXBgAI<*%|2bg7 zEzvP>ei_iE-NtSm>p!``nx=y8+I`g5s8nd&*jR?3;p=!rXz|dr;JX2zlr{qQ%WA?>L|`tj7(l84&XPxX+uPG z5qT%zkHO9n@6ubUumTh<-lrDt${Mf69gNXh!Ar!5R>u(6TVr_osu_*IS1^a(eV~du%8Inqge*ys^5R)mBx*KP(;}%fH#8lxCwn7rdp;iw20Q+szqi=&=lgg1 zi0|H8EPC?Vja&C0kKX0uLVduTU;-&)G`yJ4q*Q{Yc4!0Uq#XACSh2KCZ`LLUKu9W-l0%s&at z@ht`x8-wV92}1=Ms<1~4Vd!Z0ZC+rpF=*%{?BPS$D+_x<5&G&F-`D9R0)wt}3OEH; z71%UYkN5wFKR^Gkl3dLx;1u|;6cC-m@NkGJ*}Zjba=h32@Kwvf7 cZMZh{`5XWPi;Y3Fz}%03mcbQHfxoK2cNHg}^#A|> From ccebf7cc101dd605cf55ddc055ac158014799601 Mon Sep 17 00:00:00 2001 From: Michael McKinsey Date: Mon, 5 Jan 2026 15:48:24 -0800 Subject: [PATCH 4/5] Update unit-tests.yaml --- .github/workflows/unit-tests.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/unit-tests.yaml b/.github/workflows/unit-tests.yaml index 52ea0144..c619e785 100644 --- a/.github/workflows/unit-tests.yaml +++ b/.github/workflows/unit-tests.yaml @@ -76,9 +76,8 @@ jobs: - name: Upload coverage to Codecov uses: codecov/codecov-action@v4 - env: - CODECOV_TOKEN: ${{ secrets.THICKET_CODECOV_TOKEN }} with: + token: ${{ secrets.THICKET_CODECOV_TOKEN }} directory: ./coverage/reports/ env_vars: OS,PYTHON files: /home/runner/work/thicket/thicket/coverage.xml From a67c73c36f864aaf77a232ee15395de3576fc909 Mon Sep 17 00:00:00 2001 From: Michael McKinsey Date: Mon, 5 Jan 2026 23:20:49 -0800 Subject: [PATCH 5/5] Update unit-tests.yaml --- .github/workflows/unit-tests.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/unit-tests.yaml b/.github/workflows/unit-tests.yaml index c619e785..52ea0144 100644 --- a/.github/workflows/unit-tests.yaml +++ b/.github/workflows/unit-tests.yaml @@ -76,8 +76,9 @@ jobs: - name: Upload coverage to Codecov uses: codecov/codecov-action@v4 + env: + CODECOV_TOKEN: ${{ secrets.THICKET_CODECOV_TOKEN }} with: - token: ${{ secrets.THICKET_CODECOV_TOKEN }} directory: ./coverage/reports/ env_vars: OS,PYTHON files: /home/runner/work/thicket/thicket/coverage.xml