Skip to content

Commit

Permalink
removed warning
Browse files Browse the repository at this point in the history
  • Loading branch information
jafermarq committed Nov 6, 2023
1 parent 3476cb8 commit a1ff7a5
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 25 deletions.
2 changes: 1 addition & 1 deletion doc/source/ref-changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@

- **General updates to the simulation engine** ([#2331](https:/adap/flower/pull/2331), [#2447](https:/adap/flower/pull/2447), [#2448](https:/adap/flower/pull/2448))

- **General improvements** ([#2309](https:/adap/flower/pull/2309), [#2310](https:/adap/flower/pull/2310), [2313](https:/adap/flower/pull/2313), [#2316](https:/adap/flower/pull/2316), [2317](https:/adap/flower/pull/2317),[#2349](https:/adap/flower/pull/2349), [#2360](https:/adap/flower/pull/2360), [#2402](https:/adap/flower/pull/2402), [#2446](https:/adap/flower/pull/2446))
- **General improvements** ([#2309](https:/adap/flower/pull/2309), [#2310](https:/adap/flower/pull/2310), [2313](https:/adap/flower/pull/2313), [#2316](https:/adap/flower/pull/2316), [2317](https:/adap/flower/pull/2317),[#2349](https:/adap/flower/pull/2349), [#2360](https:/adap/flower/pull/2360), [#2402](https:/adap/flower/pull/2402), [#2446](https:/adap/flower/pull/2446) [#2561](https:/adap/flower/pull/2561))

Flower received many improvements under the hood, too many to list here.

Expand Down
25 changes: 12 additions & 13 deletions src/py/flwr/client/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

import sys
import time
import warnings
from logging import INFO
from typing import Callable, ContextManager, Optional, Tuple, Union

Expand Down Expand Up @@ -239,18 +238,18 @@ def start_numpy_client(
>>> root_certificates=Path("/crts/root.pem").read_bytes(),
>>> )
"""
warnings.warn(
"flwr.client.start_numpy_client() is deprecated and will "
"be removed in a future version of Flower. Instead, pass "
"your client to `flwr.client.start_client()` by calling "
"first the `.to_client()` method as shown below: \n"
"\tflwr.client.start_client(\n"
"\t\tserver_address='<IP>:<PORT>',\n"
"\t\tclient=FlowerClient().to_client()\n"
"\t)",
DeprecationWarning,
stacklevel=2,
)
# warnings.warn(
# "flwr.client.start_numpy_client() is deprecated and will "
# "be removed in a future version of Flower. Instead, pass "
# "your client to `flwr.client.start_client()` by calling "
# "first the `.to_client()` method as shown below: \n"
# "\tflwr.client.start_client(\n"
# "\t\tserver_address='<IP>:<PORT>',\n"
# "\t\tclient=FlowerClient().to_client()\n"
# "\t)",
# DeprecationWarning,
# stacklevel=2,
# )

# Calling this function is deprecated. A warning is thrown.
# We first need to convert either the supplied client to `Client.`
Expand Down
21 changes: 10 additions & 11 deletions src/py/flwr/simulation/ray_transport/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
"""Utilities for Actors in the Virtual Client Engine."""

import traceback
import warnings
from logging import ERROR

from flwr.client import Client
Expand All @@ -27,7 +26,7 @@
TF = None

# Display Deprecation warning once
warnings.filterwarnings("once", category=DeprecationWarning)
# warnings.filterwarnings("once", category=DeprecationWarning)


def enable_tf_gpu_growth() -> None:
Expand Down Expand Up @@ -70,15 +69,15 @@ def check_clientfn_returns_client(client: Client) -> Client:
the client internally to `Client` by calling `.to_client()`.
"""
if not isinstance(client, Client):
mssg = (
" Ensure your client is of type `Client`. Please convert it"
" using the `.to_client()` method before returning it"
" in the `client_fn` you pass to `start_simulation`."
" We have applied this conversion on your behalf."
" Not returning a `Client` might trigger an error in future"
" versions of Flower."
)
# mssg = (
# " Ensure your client is of type `Client`. Please convert it"
# " using the `.to_client()` method before returning it"
# " in the `client_fn` you pass to `start_simulation`."
# " We have applied this conversion on your behalf."
# " Not returning a `Client` might trigger an error in future"
# " versions of Flower."
# )

warnings.warn(mssg, DeprecationWarning, stacklevel=2)
# warnings.warn(mssg, DeprecationWarning, stacklevel=2)
client = client.to_client()
return client

0 comments on commit a1ff7a5

Please sign in to comment.