adaptation to Python 3.9

.github/workflows/test.yaml

@@ -8,22 +8,25 @@ on:
 
 jobs:
   Test:
-    runs-on: ubuntu-latest
-    name: Run unit tests and examples
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest]
+        python-version: ['3.8', '3.9']
+    runs-on: ${{ matrix.os }}
+    name: ${{ matrix.os }} - python ${{ matrix.python-version }}
     steps:
       - name: Checkout
         uses: actions/checkout@v3
 
       - name: Install python
         uses: actions/setup-python@v4
         with:
-          # Currently, we only support Python 3.8
-          python-version: '3.8'
+          python-version: ${{ matrix.python-version }}
 
       - name: Install dependencies
         run: |
-          wget https://paddle-ci.gz.bcebos.com/dy2st/fallback/linux-whl/paddlepaddle_gpu-0.0.0-cp38-cp38-linux_x86_64.whl
-          pip install paddlepaddle_gpu-0.0.0-cp38-cp38-linux_x86_64.whl
+          python -m pip install paddlepaddle==0.0.0 -f https://www.paddlepaddle.org.cn/whl/linux/cpu-mkl/develop.html
           pip install -r requirements.txt
 
       - name: Run unit tests

symbolic_trace/opcode_translator/executor/opcode_executor.py

@@ -528,7 +528,6 @@ def build_map(
 
     def BUILD_MAP(self, instr):
         map_size = instr.arg
-        built_map = {}
         assert map_size * 2 <= len(
             self._stack
         ), f"OpExecutor want BUILD_MAP with size {map_size} * 2, but current stack do not have enough elems."
@@ -691,6 +690,15 @@ def COMPARE_OP(self, instr):
                 f"{instr} is not support. may be not a supported compare op."
             )
 
+    def IS_OP(self, instr):
+        # It will only be 0 or 1
+        assert instr.argval == 0 or instr.argval == 1
+        right, left = self.pop(), self.pop()
+        if instr.argval == 0:
+            self.push(SUPPORT_COMPARE_OP["is"](left, right))
+        else:
+            self.push(SUPPORT_COMPARE_OP["is not"](left, right))
+
     def MAKE_FUNCTION(self, instr):
         fn_name = self.pop()
         codeobj = self.pop()
@@ -925,6 +933,38 @@ def FORMAT_VALUE(self, instr):
         else:
             raise UnsupportError(f"Do not support format {type(value)} now")
 
+    # NOTE: This operation will generate SideEffects, and the mechanism has not been completed yet
+    def DICT_UPDATE(self, instr):
+        dict_value = self.pop()
+        assert instr.argval > 0
+        self._stack[-instr.arg].update(dict_value)
+
+    def DICT_MERGE(self, instr):
+        dict_value = self.pop()
+        assert instr.argval > 0
+        for key in dict_value.get_wrapped_items().keys():
+            result = self._stack[-instr.arg].get_wrapped_items().get(key, None)
+            if result is not None:
+                raise InnerError(
+                    f"got multiple values for keyword argument '{key}'"
+                )
+        self._stack[-instr.arg].update(dict_value)
+
+    def LIST_EXTEND(self, instr):
+        list_value = self.pop()
+        assert instr.argval > 0
+        self._stack[-instr.arg].extend(list_value)
+
+    def LIST_TO_TUPLE(self, instr):
+        list_value = self.pop()
+        self.push(
+            TupleVariable(
+                list_value.get_wrapped_items(),
+                self._graph,
+                DummyTracker([instr.argval]),
+            )
+        )
+
     def RETURN_VALUE(self, instr):
         assert (
             len(self._stack) == 1

symbolic_trace/opcode_translator/executor/variables/container.py

@@ -116,6 +116,10 @@ def __delitem__(self, key):
             )
         del self.value[key]
 
+    def override_method_extend(self, data):
+        self.value.extend(data.get_wrapped_items())
+        return self
+
     @VariableFactory.register_from_value()
     def from_value(value: Any, graph: FunctionGraph | None, tracker: Tracker):
         if isinstance(value, list):
@@ -314,6 +318,10 @@ def override_method_items(self):
             item_list, self.graph, DummyTracker([item_list])
         )
 
+    def override_method_update(self, data):
+        self.value.update(data.get_wrapped_items())
+        return self
+
     def __getattr__(self, name):
         from .callable import DirectlyCallMethodVariable
 

tests/run_all.sh

@@ -2,6 +2,8 @@
 export PYTHONPATH=$PYTHONPATH:../
 export STRICT_MODE=1
 
+failed_tests=()
+
 for file in ./test_*.py; do
     # 检查文件是否为 Python 文件
     if [ -f "$file" ]; then
@@ -10,7 +12,15 @@ for file in ./test_*.py; do
         python "$file"
         if [ $? -ne 0 ]; then
             echo "run $file failed"
-            exit 1
+            failed_tests+=("$file")
         fi
     fi
 done
+
+if [ ${#failed_tests[@]} -ne 0 ]; then
+    echo "failed tests file:"
+    for failed_test in "${failed_tests[@]}"; do
+        echo "$failed_test"
+    done
+    exit 1
+fi

tests/test_10_build_unpack.py

@@ -3,6 +3,10 @@
 # BUILD_TUPLE_UNPACK_WITH_CALL (new)
 # CALL_FUNCTION_EX (new)
 # BUILD_MAP_UNPACK (new)
+# LIST_EXTEND (new)
+# LIST_TO_TUPLE (new)
+# DICT_UPDATE (new)
+# DICT_MERGE (new)
 
 from __future__ import annotations