Support FATE v1.11.1

helm-charts/charts/fate-exchange/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: "exchangev1.10.0 & fedlcmv0.3.0"
+appVersion: "exchangev1.11.1 & fedlcmv0.3.0"
 description: A Helm chart for fate exchange and fml-manager
 name: fate-exchange
-version: v1.10.0-fedlcm-v0.3.0
+version: v1.11.1-fedlcm-v0.3.0

helm-charts/charts/fate-exchange/values-template-example.yaml

@@ -1,7 +1,7 @@
 name: fate-exchange
 namespace: fate-exchange
 chartName: fate-exchange
-chartVersion: v1.10.0-fedlcm-v0.3.0
+chartVersion: v1.11.1-fedlcm-v0.3.0
 partyId: 1
 registry: ""
 pullPolicy:
@@ -19,7 +19,7 @@ modules:
   - postgres
   - fmlManagerServer
 
-# rollsite: 
+# rollsite:
 #   type: NodePort
 #   nodePort: 30001
 #   loadBalancerIP: 192.168.0.1
@@ -40,7 +40,7 @@ modules:
 #   type: NodePort
 #   nodePort: 30007
 #   loadBalancerIP: 192.168.0.1
-#   route_table: 
+#   route_table:
 #     sni:
 #     - fqdn: 10000.fate.org
 #       tunnelRoute: 192.168.0.2:30109
@@ -56,22 +56,22 @@ modules:
 #   httpNodePort: 30003
 #   grpcNodePort: 30008
 #   loadBalancerIP: 192.168.0.1
-#   route_table: 
-#     9999: 
-#       proxy: 
-#         - host: 192.168.9.1 
+#   route_table:
+#     9999:
+#       proxy:
+#         - host: 192.168.9.1
 #           http_port: 30093
-#           grpc_port: 30098 
-#       fateflow: 
+#           grpc_port: 30098
+#       fateflow:
 #         - host: 192.168.9.1
 #           http_port: 30097
 #           grpc_port: 30092
-#     10000: 
-#       proxy: 
-#         - host: 192.168.10.1 
+#     10000:
+#       proxy:
+#         - host: 192.168.10.1
 #           http_port: 30103
-#           grpc_port: 30108 
-#       fateflow: 
+#           grpc_port: 30108
+#       fateflow:
 #         - host: 192.168.10.1
 #           http_port: 30107
 #           grpc_port: 30102
@@ -94,7 +94,7 @@ modules:
   # tolerations:
   # affinity:
   # type: NodePort
-  # nodePort: 
+  # nodePort:
   # loadBalancerIP: 192.168.0.1
   # postgresHost: postgres
   # postgresPort: 5432

helm-charts/charts/fate-exchange/values.yaml

@@ -4,10 +4,10 @@ partyName: fate-exchange
 image:
   registry: federatedai
   isThridParty:
-  tag: 1.10.0-release
+  tag: 1.11.1-release
   pullPolicy: IfNotPresent
   imagePullSecrets:
-#  - name: 
+#  - name:
 
 podSecurityPolicy:
   enabled: false
@@ -112,7 +112,7 @@ modules:
     # tolerations:
     # affinity:
     type: ClusterIP
-    # nodePort: 
+    # nodePort:
     # loadBalancerIP: 192.168.0.1
     postgresHost: postgres
     postgresPort: 5432

helm-charts/charts/fate/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v1
-appVersion: "fatev1.10.0+fedlcmv0.3.0"
+appVersion: "fatev1.11.1+fedlcmv0.3.0"
 description: Helm chart for FATE and site-portal in FedLCM
 name: fate
-version: v1.10.0-fedlcm-v0.3.0
+version: v1.11.1-fedlcm-v0.3.0
 home: https://fate.fedai.org
 icon: https://aisp-1251170195.cos.ap-hongkong.myqcloud.com/wp-content/uploads/sites/12/2019/09/logo.png
 sources:

helm-charts/charts/fate/templates/backends/eggroll/_helpers.tpl

@@ -19,4 +19,7 @@
 {{- if eq .Values.device "IPCL" -}}
 -ipcl
 {{- end -}}
+{{- if eq .Values.device "GPU" -}}
+-gpu
+{{- end -}}
 {{- end -}}

helm-charts/charts/fate/templates/backends/spark/_helpers.tpl

@@ -19,4 +19,7 @@
 {{- if eq .Values.device "IPCL" -}}
 -ipcl
 {{- end -}}
+{{- if eq .Values.device "GPU" -}}
+-gpu
+{{- end -}}
 {{- end -}}

helm-charts/charts/fate/templates/core/_helpers.tpl

@@ -21,4 +21,7 @@
 {{- if eq .Values.device "IPCL" -}}
 -ipcl
 {{- end -}}
+{{- if eq .Values.device "GPU" -}}
+-gpu
+{{- end -}}
 {{- end -}}

helm-charts/charts/fate/templates/core/fateflow/configmap.yaml

@@ -213,62 +213,7 @@ data:
       password: fate
       {{- end }}
     {{- end }}
-  transfer_conf.yaml: |
-    paths: # dir or path
-      - "python/federatedml/transfer_variable/auth_conf"
-  component_registry.json: |
-    {
-      "components": {
-      },
-      "providers": {
-      },
-      "default_settings": {
-        "fate_flow":{
-          "default_version_key": "FATEFlow"
-        },
-        "fate": {
-          "default_version_key": "FATE"
-        },
-        "class_path": {
-          "interface": "components.components.Components",
-          "feature_instance": "feature.instance.Instance",
-          "feature_vector": "feature.sparse_vector.SparseVector",
-          "model": "protobuf.generated",
-          "model_migrate": "protobuf.model_migrate.model_migrate",
-          "homo_model_convert": "protobuf.homo_model_convert.homo_model_convert"
-        }
-      }
-    }
-  job_default_config.yaml: |
-    # component provider, relative path to get_fate_python_directory
-    default_component_provider_path: federatedml
-
-    # resource
-    total_cores_overweight_percent: 1  # 1 means no overweight
-    total_memory_overweight_percent: 1  # 1 means no overweight
-    task_parallelism: 1
-    task_cores: 4
-    task_memory: 0  # mb
-    max_cores_percent_per_job: 1  # 1 means total
-
-    # scheduling
-    job_timeout: 259200 # s
-    remote_request_timeout: 30000  # ms
-    federated_command_trys: 3
-    end_status_job_scheduling_time_limit: 300000 # ms
-    end_status_job_scheduling_updates: 1
-    auto_retries: {{ .Values.modules.python.failedTaskAutoRetryTimes }}
-    auto_retry_delay: {{ .Values.modules.python.failedTaskAutoRetryDelay }}  #seconds
-    # It can also be specified in the job configuration using the federated_status_collect_type parameter
-    federated_status_collect_type: PUSH
-    detect_connect_max_retry_count: 3
-    detect_connect_long_retry_count: 2
-
-    # upload
-    upload_max_bytes: 104857600 # bytes
-
-    #component output
-    output_data_summary_count_limit: 100
+
 ---
 kind: ConfigMap
 apiVersion: v1

helm-charts/charts/fate/templates/core/python-spark.yaml

@@ -118,10 +118,7 @@ spec:
             - |
                 set -x
                 mkdir -p /data/projects/fate/conf/
-                cp /data/projects/fate/conf-tmp/transfer_conf.yaml /data/projects/fate/conf/transfer_conf.yaml
                 cp /data/projects/fate/conf-tmp/service_conf.yaml /data/projects/fate/conf/service_conf.yaml
-                cp /data/projects/fate/conf-tmp/component_registry.json /data/projects/fate/fateflow/conf/component_registry.json
-                cp /data/projects/fate/conf-tmp/job_default_config.yaml /data/projects/fate/fateflow/conf/job_default_config.yaml
                 # fix fateflow conf must use IP
                 sed -i "s/host: fateflow_ip/host: ${POD_IP}/g" /data/projects/fate/conf/service_conf.yaml
 
@@ -238,6 +235,6 @@ spec:
         storageClassName: {{ .Values.modules.python.storageClass }}
         resources:
           requests:
-            storage: {{ .Values.modules.mysql.size }}
+            storage: {{ .Values.modules.python.size }}
         {{- end }}
 {{- end }}

helm-charts/charts/fate/values-template-example.yaml

@@ -1,7 +1,7 @@
 name: site-portal-9999
 namespace: site-portal-9999
 chartName: fate
-chartVersion: v1.10.0-fedlcm-v0.3.0
+chartVersion: v1.11.1-fedlcm-v0.3.0
 partyId: 9999
 registry: ""
 pullPolicy:
@@ -34,7 +34,7 @@ federation: Pulsar
 storage: HDFS
 # Algorithm: [Basic, NN]
 algorithm: Basic
-# Device: [IPCL, CPU]
+# Device: [IPCL, CPU, GPU]
 device: CPU
 
 skippedKeys:
@@ -62,11 +62,11 @@ skippedKeys:
   # pulsar:
     # hosts:
     # - name: party9999.pulsar.example.com
-  # frontend: 
+  # frontend:
     # hosts:
     # - name: party9999.frontend.example.com
-  
-# rollsite: 
+
+# rollsite:
   # type: NodePort
   # nodePort: 30091
   # loadBalancerIP:
@@ -276,7 +276,7 @@ skippedKeys:
 # spark:
   # master:
     # Image: "federatedai/spark-master"
-    # ImageTag: "1.10.0-release"
+    # ImageTag: "1.11.1-release"
     # replicas: 1
     # resources:
       # requests:
@@ -292,7 +292,7 @@ skippedKeys:
     # nodePort: 30977
   # worker:
     # Image: "federatedai/spark-worker"
-    # ImageTag: "1.10.0-release"
+    # ImageTag: "1.11.1-release"
     # replicas: 2
     # resources:
       # requests:
@@ -431,15 +431,15 @@ skippedKeys:
 #   storageClass: ""
 #   accessMode: ReadWriteOnce
 #   size: 1Gi
-  
+
 # frontend:
 #   image: federatedai/site-portal-frontend
 #   imageTag: v0.3.0
 #   nodeSelector:
 #   tolerations:
 #   affinity:
 #   type: ClusterIP
-#   nodePort: 
+#   nodePort:
 #   loadBalancerIP:
 
 # sitePortalServer:

helm-charts/charts/fate/values.yaml

@@ -2,7 +2,7 @@
 image:
   registry: federatedai
   isThridParty:
-  tag: 1.10.0-release
+  tag: 1.11.1-release
   pullPolicy: IfNotPresent
   imagePullSecrets: 
 #  - name: 
@@ -18,7 +18,7 @@ federation: Eggroll
 storage: Eggroll
 # Algorithm: Basic, NN
 algorithm: Basic
-# Device: CPU, IPCL
+# Device: CPU, IPCL, GPU
 device: IPCL
 
 istio:
@@ -64,12 +64,12 @@ ingress:
       path: /
     tls: []
   frontend:
-    # annotations: 
+    # annotations:
     hosts:
     - name:  frontend.example.com
       path: /
     tls: []
-    
+
 exchange:
   partyIp: 192.168.1.1
   partyPort: 30001
@@ -222,7 +222,7 @@ modules:
         memory: "4Gi"
 
 
-  mysql: 
+  mysql:
     include: true
     type: ClusterIP
     nodeSelector:
@@ -382,7 +382,7 @@ modules:
     # tolerations:
     # affinity:
     type: ClusterIP
-    # nodePort: 
+    # nodePort:
     # loadBalancerIP:
     user: site_portal
     password: site_portal
@@ -392,7 +392,7 @@ modules:
     storageClass: ""
     accessMode: ReadWriteOnce
     size: 1Gi
-  
+
   frontend:
     include: false
     image: federatedai/site-portal-frontend
@@ -401,10 +401,10 @@ modules:
     # tolerations:
     # affinity:
     type: ClusterIP
-    
-    # nodePort: 
+
+    # nodePort:
     # loadBalancerIP:
-    
+
   sitePortalServer:
     include: false
     image: site-portal-server
@@ -413,7 +413,7 @@ modules:
     # tolerations:
     # affinity:
     type: ClusterIP
-    # nodePort: 
+    # nodePort:
     # loadBalancerIP:
     existingClaim: ""
     storageClass: "sitePortalServer"

helm-charts/fml-manager.yaml

@@ -1,7 +1,7 @@
 name: fml-manager
 namespace: fml-manager
 chartName: fate-exchange
-chartVersion: v1.10.0-fedlcm-v0.3.0
+chartVersion: v1.11.1-fedlcm-v0.3.0
 partyId: 0
 registry: ""
 pullPolicy: