resolve conflict

intelligent-machine-learning · Jan 2, 2025 · 7173753 · 7173753
2 parents 5bbf7bb + c7ca4b8
commit 7173753
Show file tree

Hide file tree

Showing 22 changed files with 267 additions and 459 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1,5 +1,5 @@
 ---
-name: main test for the project
+name: code-check
 
 on:
   pull_request:
@@ -35,7 +35,7 @@ jobs:
       - name: Upload coverage reports to Codecov
         uses: codecov/[email protected]
         with:
-          token: 043586e5-68b8-4588-9bf4-c333f2692345
+          token: 3b0503fb-7c5e-4486-9ddf-2903deb77067
           slug: intelligent-machine-learning/dlrover
   operator-test:
     runs-on: ubuntu-latest

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -67,14 +67,3 @@ repos:
       - id: yamllint
         exclude:
           (dlrover/python/tests/data|operator/config)
-#  - repo: https://github.com/igorshubovych/markdownlint-cli
-#    rev: v0.35.0
-#    hooks:
-#      - id: markdownlint
-#        name: markdownlint
-#        description: "Checks the style of Markdown files."
-#        entry: markdownlint --fix --config .markdownlint.yaml
-#        language: node
-#        types: [markdown]
-#        exclude: (dlrover/go/brain/vendor)
-#        args: [--fix]
diff --git a/dlrover/go/master/go.mod b/dlrover/go/master/go.mod
@@ -0,0 +1,3 @@
+module github.com/intelligent-machine-learning/dlrover/go/master
+
+go 1.23.4
diff --git a/dlrover/python/brain/hpsearch/__init__.py b/dlrover/python/brain/hpsearch/__init__.py
diff --git a/dlrover/python/brain/hpsearch/base.py b/dlrover/python/brain/hpsearch/base.py
diff --git a/dlrover/python/brain/hpsearch/bo.py b/dlrover/python/brain/hpsearch/bo.py
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		module github.com/intelligent-machine-learning/dlrover/go/master

		go 1.23.4