diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index ef534c5c6f..2532d4e350 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -35,29 +35,28 @@ jobs: key: ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-${{ hashFiles('ci/environment.yml') }} - - uses: conda-incubator/setup-miniconda@v2 + - uses: mamba-org/setup-micromamba@v1.9.0 with: - miniconda-version: "latest" - auto-update-conda: true environment-file: ci/environment.yml - python-version: ${{ matrix.python-version }} - use-only-tar-bz2: true + create-args: >- + python=${{ matrix.python-version }} + cmake=3.21.1 - name: Install Windows Conda Packages if: contains(matrix.os, 'windows') shell: bash -e -l {0} - run: conda install m2-bison=3.0.4 cmake=3.21.1 + run: micromamba install --freeze-installed m2-bison=3.0.4 m2-filesystem - name: Install Linux / macOS Conda Packages if: contains(matrix.os, 'ubuntu') || contains(matrix.os, 'macos') shell: bash -e -l {0} - run: conda install bison=3.4 nodejs=18 + run: micromamba install --freeze-installed bison=3.4 nodejs=18 - name: Conda info shell: bash -e -l {0} run: | - conda info - conda list + micromamba info + micromamba list - name: Setup Platform (Linux) if: contains(matrix.os, 'ubuntu') @@ -87,9 +86,9 @@ jobs: if: contains(matrix.os, 'windows') shell: cmd run: | - set CONDA_INSTALL_LOCN=C:\\Miniconda3 - call %CONDA_INSTALL_LOCN%\Scripts\activate.bat - call conda activate test + set MAMBA_INSTALL_LOCN=C:\\Users\runneradmin\micromamba + call %MAMBA_INSTALL_LOCN%\Scripts\activate.bat + call micromamba activate lp set LFORTRAN_CMAKE_GENERATOR=Ninja set WIN=1 set MACOS=0 @@ -107,9 +106,9 @@ jobs: if: contains(matrix.os, 'windows') shell: cmd run: | - set CONDA_INSTALL_LOCN=C:\\Miniconda3 - call %CONDA_INSTALL_LOCN%\Scripts\activate.bat - call conda activate test + set MAMBA_INSTALL_LOCN=C:\\Users\runneradmin\micromamba + call %MAMBA_INSTALL_LOCN%\Scripts\activate.bat + call micromamba activate lp set LFORTRAN_CMAKE_GENERATOR=Ninja set WIN=1 set MACOS=0 diff --git a/ci/environment.yml b/ci/environment.yml index 4fcd733601..05e00cbfa9 100644 --- a/ci/environment.yml +++ b/ci/environment.yml @@ -4,20 +4,19 @@ channels: - defaults dependencies: - llvmdev=11.1.0 - - toml=0.10.2 - - pytest=7.2.0 - - jupyter=1.0.0 - - xeus=1.0.1 - - xtl=0.7.4 - - nlohmann_json=3.9.1 - - cppzmq=4.7.1 - - jupyter_kernel_test=0.4.4 + - xeus=5.1.0 + - xeus-zmq=3.0.0 - xonsh=0.13.3 - - re2c=2.2 - - numpy=1.23.4 + - rapidjson + - nlohmann_json + - toml + - pytest + - jupyter + - jupyter_kernel_test + - re2c + - numpy - zlib - zstd - - ninja=1.11.0 - - rapidjson=1.1.0 + - ninja # - bison=3.4 [not win] # - m2-bison=3.4 [win] diff --git a/integration_tests/CMakeLists.txt b/integration_tests/CMakeLists.txt index f6396d0be6..caad1f5c96 100644 --- a/integration_tests/CMakeLists.txt +++ b/integration_tests/CMakeLists.txt @@ -773,7 +773,7 @@ RUN(NAME test_logical_compare LABELS cpython llvm llvm_jit) # TODO: Ad RUN(NAME test_logical_assignment LABELS cpython llvm llvm_jit) # TODO: Add C backend after fixing issue #2708 RUN(NAME vec_01 LABELS cpython llvm llvm_jit c NOFAST) RUN(NAME test_str_comparison LABELS cpython llvm llvm_jit c wasm) -RUN(NAME test_bit_length LABELS cpython llvm llvm_jit c) +RUN(NAME test_bit_length LABELS cpython c) # FIXME: This test fails on llvm & llvm_jit RUN(NAME str_to_list_cast LABELS cpython llvm llvm_jit c) RUN(NAME cast_01 LABELS cpython llvm llvm_jit c) RUN(NAME cast_02 LABELS cpython llvm llvm_jit c) diff --git a/src/lpython/python_evaluator.cpp b/src/lpython/python_evaluator.cpp index 836ddaad22..b8bc2ee3ed 100644 --- a/src/lpython/python_evaluator.cpp +++ b/src/lpython/python_evaluator.cpp @@ -143,11 +143,11 @@ Result PythonCompiler::evaluate( ->m_symtab->get_symbol(run_fn); LCOMPILERS_ASSERT(fn) if (ASRUtils::get_FunctionType(fn)->m_return_var_type->type == ASR::ttypeType::UnsignedInteger) { - uint8_t r = e->execfn(run_fn); + uint8_t r = e->execfn(run_fn); result.type = EvalResult::unsignedInteger1; result.u32 = r; } else { - int8_t r = e->execfn(run_fn); + int8_t r = e->execfn(run_fn); result.type = EvalResult::integer1; result.i32 = r; } @@ -156,11 +156,11 @@ Result PythonCompiler::evaluate( ->m_symtab->get_symbol(run_fn); LCOMPILERS_ASSERT(fn) if (ASRUtils::get_FunctionType(fn)->m_return_var_type->type == ASR::ttypeType::UnsignedInteger) { - uint16_t r = e->execfn(run_fn); + uint16_t r = e->execfn(run_fn); result.type = EvalResult::unsignedInteger2; result.u32 = r; } else { - int16_t r = e->execfn(run_fn); + int16_t r = e->execfn(run_fn); result.type = EvalResult::integer2; result.i32 = r; }