diff --git a/.github/workflows/unit-tests.yaml b/.github/workflows/unit-tests.yaml index ba28d62d..b9d37453 100644 --- a/.github/workflows/unit-tests.yaml +++ b/.github/workflows/unit-tests.yaml @@ -75,17 +75,19 @@ jobs: working-directory: Caliper run: | echo -e "PWD: $(pwd)" - mkdir build && mkdir install + mkdir build cd build - cmake -DCMAKE_INSTALL_PREFIX=../install ../ + cmake -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/caliper-install ../ make VERBOSE=1 make install - export PATH=$(pwd)/../install/bin:${PATH} + export PATH=${{ github.workspace }}/caliper-install/bin:${PATH} echo -e "PATH=${PATH}" - cd $GITHUB_WORKSPACE echo -e "PWD:${PWD}" which cali-query + echo "${{ github.workspace }}/caliper-install/bin" >> "$GITHUB_PATH" + echo "LD_LIBRARY_PATH=${{ github.workspace }}/caliper-install/lib:${{ github.workspace }}/caliper-install/lib64:$LD_LIBRARY_PATH" >> "$GITHUB_ENV" - name: Test Caliper and Timemory Support with pytest run: | + which cali-query PYTHONPATH=. $(which pytest) diff --git a/hatchet/tests/caliper.py b/hatchet/tests/caliper.py index 554fb465..90d50673 100644 --- a/hatchet/tests/caliper.py +++ b/hatchet/tests/caliper.py @@ -66,7 +66,7 @@ def test_graphframe(lulesh_caliper_json): def test_read_lulesh_json(lulesh_caliper_json): """Sanity check the Caliper reader by examining a known input.""" - reader = CaliperReader(str(lulesh_caliper_json)) + reader = CaliperReader(str(lulesh_caliper_json), node_ordering=False) reader.read_json_sections() assert len(reader.json_data) == 192 @@ -95,7 +95,7 @@ def test_lulesh_cali(lulesh_caliper_cali): grouping_attribute, ) - gf = GraphFrame.from_caliper(str(lulesh_caliper_cali), query) + gf = GraphFrame.from_caliper(str(lulesh_caliper_cali), query, node_ordering=False) assert len(gf.dataframe.groupby("name")) == 18 @@ -115,7 +115,7 @@ def test_lulesh_json_stream(lulesh_caliper_cali): [cali_query, "-q", query, lulesh_caliper_cali], stdout=subprocess.PIPE ) - gf = GraphFrame.from_caliper(cali_json.stdout) + gf = GraphFrame.from_caliper(cali_json.stdout, node_ordering=False) assert len(gf.dataframe.groupby("name")) == 18