bug: fix channels when use conda install with yaml file (#831)

* fix conda Signed-off-by: Jinjing.Zhou <allenzhou@tensorchord.ai> * add test Signed-off-by: Jinjing.Zhou <allenzhou@tensorchord.ai> * add cpuonly Signed-off-by: Jinjing.Zhou <allenzhou@tensorchord.ai> Signed-off-by: Jinjing.Zhou <allenzhou@tensorchord.ai>
tensorchord · Aug 31, 2022 · 5e7c182 · 5e7c182
1 parent be02a70
commit 5e7c182
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 0 deletions.
diff --git a/e2e/language/python_test.go b/e2e/language/python_test.go
@@ -48,4 +48,14 @@ var _ = Describe("python", Ordered, func() {
 		e.DestroyContainer()()
 		e.RemoveImage()()
 	})
+
+	It("Should build conda with channel successfully", func() {
+		exampleName := "python/conda"
+		testcase := "e2e"
+		e := e2e.NewExample(buildContextDirWithName(exampleName), testcase)
+		e.BuildImage(true)()
+		e.RunContainer()()
+		e.DestroyContainer()()
+		e.RemoveImage()()
+	})
 })
diff --git a/e2e/language/testdata/python/conda/build.envd b/e2e/language/testdata/python/conda/build.envd
@@ -0,0 +1,3 @@
+def build():
+    install.conda_packages(env_file = "env.yaml")
+    base(os="ubuntu20.04", language="python3.8")
diff --git a/e2e/language/testdata/python/conda/env.yaml b/e2e/language/testdata/python/conda/env.yaml
@@ -0,0 +1,6 @@
+channels:
+  - pytorch
+  - defaults
+dependencies:
+  - pytorch=1.11.0
+  - cpuonly
diff --git a/pkg/lang/ir/interface.go b/pkg/lang/ir/interface.go
@@ -179,6 +179,8 @@ func CondaPackage(deps []string, channel []string, envFile *string) error {
 		}
 		DefaultGraph.CondaConfig.CondaPackages = append(DefaultGraph.CondaConfig.CondaPackages, parsed.CondaPackages...)
 		DefaultGraph.PyPIPackages = append(DefaultGraph.PyPIPackages, parsed.PipPackages...)
+		DefaultGraph.CondaConfig.AdditionalChannels = append(
+			DefaultGraph.CondaConfig.AdditionalChannels, parsed.Channels...)
 	}
 	if len(channel) != 0 {
 		DefaultGraph.CondaConfig.AdditionalChannels = append(

diff --git a/pkg/lang/ir/parser/conda.go b/pkg/lang/ir/parser/conda.go
@@ -24,6 +24,7 @@ type CondaEnv struct {
 	EnvName       string
 	CondaPackages []string
 	PipPackages   []string
+	Channels      []string
 }
 
 func ParseCondaEnvYaml(condaEnvFile string) (*CondaEnv, error) {
@@ -34,6 +35,8 @@ func ParseCondaEnvYaml(condaEnvFile string) (*CondaEnv, error) {
 		return nil, errors.Wrapf(err, "failed to read the Conda Env File %s", condaEnvFile)
 	}
 	env.EnvName = config.GetString("name")
+	env.Channels = config.GetStringSlice("channels")
+
 	for _, dependencies := range config.Get("dependencies").([]interface{}) {
 		switch dep := dependencies.(type) {
 		case string: